"There is no need to verbose", ancients legends said

src/main/java/refinedstorage/RS.java

@@ -15,8 +15,8 @@ import net.minecraftforge.fml.common.network.NetworkRegistry;
 import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
 import refinedstorage.proxy.CommonProxy;
 
-@Mod(modid = RefinedStorage.ID, version = RefinedStorage.VERSION, guiFactory = RefinedStorage.GUI_FACTORY, dependencies = RefinedStorage.DEPENDENCIES)
-public final class RefinedStorage {
+@Mod(modid = RS.ID, version = RS.VERSION, guiFactory = RS.GUI_FACTORY, dependencies = RS.DEPENDENCIES)
+public final class RS {
     public static final String ID = "refinedstorage";
     public static final String VERSION = "1.2";
     public static final String DEPENDENCIES = "required-after:Forge@[12.18.1.2088,);required-after:mcmultipart@[1.2.1,);after:JEI@[3.12.0,);";
@@ -26,16 +26,16 @@ public final class RefinedStorage {
     public static CommonProxy PROXY;
 
     @Instance
-    public static RefinedStorage INSTANCE;
+    public static RS INSTANCE;
 
-    public RefinedStorageConfig config;
+    public RSConfig config;
 
     public final SimpleNetworkWrapper network = NetworkRegistry.INSTANCE.newSimpleChannel(ID);
 
     public final CreativeTabs tab = new CreativeTabs(ID) {
         @Override
         public ItemStack getIconItemStack() {
-            return new ItemStack(RefinedStorageItems.STORAGE_HOUSING);
+            return new ItemStack(RSItems.STORAGE_HOUSING);
         }
 
         @Override
@@ -50,7 +50,7 @@ public final class RefinedStorage {
 
     @EventHandler
     public void preInit(FMLPreInitializationEvent e) {
-        config = new RefinedStorageConfig(e.getSuggestedConfigurationFile());
+        config = new RSConfig(e.getSuggestedConfigurationFile());
 
         PROXY.preInit(e);
     }

src/main/java/refinedstorage/RSBlocks.java

@@ -2,7 +2,7 @@ package refinedstorage;
 
 import refinedstorage.block.*;
 
-public final class RefinedStorageBlocks {
+public final class RSBlocks {
     public static final BlockController CONTROLLER = new BlockController();
     public static final BlockCable CABLE = new BlockCable();
     public static final BlockGrid GRID = new BlockGrid();

src/main/java/refinedstorage/RSConfig.java

@@ -11,7 +11,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-public final class RefinedStorageConfig {
+public final class RSConfig {
     private Configuration config;
 
     //region Energy
@@ -80,7 +80,7 @@ public final class RefinedStorageConfig {
     private static final String MISC = "misc";
     //endregion
 
-    public RefinedStorageConfig(File configFile) {
+    public RSConfig(File configFile) {
         config = new Configuration(configFile);
 
         MinecraftForge.EVENT_BUS.register(this);
@@ -94,7 +94,7 @@ public final class RefinedStorageConfig {
 
     @SubscribeEvent
     public void onConfigChangedEvent(ConfigChangedEvent.OnConfigChangedEvent event) {
-        if (event.getModID().equalsIgnoreCase(RefinedStorage.ID)) {
+        if (event.getModID().equalsIgnoreCase(RS.ID)) {
             loadConfig();
         }
     }

src/main/java/refinedstorage/RSGui.java

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

src/main/java/refinedstorage/RSItems.java

@@ -2,7 +2,7 @@ package refinedstorage;
 
 import refinedstorage.item.*;
 
-public final class RefinedStorageItems {
+public final class RSItems {
     public static final ItemStorageDisk STORAGE_DISK = new ItemStorageDisk();
     public static final ItemWirelessGrid WIRELESS_GRID = new ItemWirelessGrid();
     public static final ItemQuartzEnrichedIron QUARTZ_ENRICHED_IRON = new ItemQuartzEnrichedIron();

src/main/java/refinedstorage/api/RSAPI.java

@@ -2,7 +2,7 @@ package refinedstorage.api;
 
 import java.lang.reflect.Field;
 
-public final class RefinedStorageAPI {
+public final class RSAPI {
     private static final String API_IMPL_CLASS = "refinedstorage.apiimpl.API";
     private static final String API_IMPL_FIELD = "INSTANCE";
 

src/main/java/refinedstorage/api/network/NetworkUtils.java

@@ -10,7 +10,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fml.common.network.ByteBufUtils;
-import refinedstorage.api.RefinedStorageAPI;
+import refinedstorage.api.RSAPI;
 import refinedstorage.api.autocrafting.ICraftingPattern;
 import refinedstorage.api.autocrafting.ICraftingPatternContainer;
 import refinedstorage.api.autocrafting.ICraftingPatternProvider;
@@ -37,7 +37,7 @@ public final class NetworkUtils {
     }
 
     public static ICraftingTask createCraftingTask(INetworkMaster network, @Nullable ItemStack stack, ICraftingPattern pattern, int quantity) {
-        return RefinedStorageAPI.instance().getCraftingTaskRegistry().getFactory(pattern.getId()).create(network.getNetworkWorld(), network, stack, pattern, quantity, null);
+        return RSAPI.instance().getCraftingTaskRegistry().getFactory(pattern.getId()).create(network.getNetworkWorld(), network, stack, pattern, quantity, null);
     }
 
     public static boolean hasPattern(INetworkMaster network, ItemStack stack) {
@@ -85,7 +85,7 @@ public final class NetworkUtils {
             if (container instanceof ICraftingPatternContainer) {
                 ICraftingPattern pattern = ((ICraftingPatternProvider) stack.getItem()).create(world, stack, (ICraftingPatternContainer) container);
 
-                ICraftingTaskFactory factory = RefinedStorageAPI.instance().getCraftingTaskRegistry().getFactory(tag.getString(ICraftingTask.NBT_PATTERN_ID));
+                ICraftingTaskFactory factory = RSAPI.instance().getCraftingTaskRegistry().getFactory(tag.getString(ICraftingTask.NBT_PATTERN_ID));
 
                 if (factory != null) {
                     return factory.create(world, network, null, pattern, tag.getInteger(ICraftingTask.NBT_QUANTITY), tag);

src/main/java/refinedstorage/apiimpl/autocrafting/task/CraftingTaskNormal.java

@@ -3,7 +3,7 @@ package refinedstorage.apiimpl.autocrafting.task;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.items.ItemHandlerHelper;
-import refinedstorage.api.RefinedStorageAPI;
+import refinedstorage.api.RSAPI;
 import refinedstorage.api.autocrafting.ICraftingPattern;
 import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement;
 import refinedstorage.api.autocrafting.task.ICraftingTask;
@@ -27,9 +27,9 @@ public class CraftingTaskNormal implements ICraftingTask {
     private int quantity;
     private Deque<ItemStack> toTake = new ArrayDeque<>();
     private List<IProcessable> toProcess = new ArrayList<>();
-    private IItemStackList toCraft = RefinedStorageAPI.instance().createItemStackList();
-    private IItemStackList missing = RefinedStorageAPI.instance().createItemStackList();
-    private IItemStackList extras = RefinedStorageAPI.instance().createItemStackList();
+    private IItemStackList toCraft = RSAPI.instance().createItemStackList();
+    private IItemStackList missing = RSAPI.instance().createItemStackList();
+    private IItemStackList extras = RSAPI.instance().createItemStackList();
 
     public CraftingTaskNormal(INetworkMaster network, ItemStack requested, ICraftingPattern pattern, int quantity) {
         this.network = network;
@@ -161,7 +161,7 @@ public class CraftingTaskNormal implements ICraftingTask {
         ));
 
         if (!toTake.isEmpty()) {
-            IItemStackList toTake = RefinedStorageAPI.instance().createItemStackList();
+            IItemStackList toTake = RSAPI.instance().createItemStackList();
 
             for (ItemStack stack : new ArrayList<>(this.toTake)) {
                 toTake.add(stack);

src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java

@@ -5,9 +5,9 @@ import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumHand;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageGui;
-import refinedstorage.RefinedStorageItems;
+import refinedstorage.RS;
+import refinedstorage.RSGui;
+import refinedstorage.RSItems;
 import refinedstorage.api.network.*;
 import refinedstorage.item.ItemWirelessGrid;
 
@@ -55,17 +55,17 @@ public class WirelessGridHandler implements IWirelessGridHandler {
 
         ItemStack stack = player.getHeldItem(hand);
 
-        if (RefinedStorage.INSTANCE.config.wirelessGridUsesEnergy && stack.getItemDamage() != ItemWirelessGrid.TYPE_CREATIVE && RefinedStorageItems.WIRELESS_GRID.getEnergyStored(stack) <= RefinedStorage.INSTANCE.config.wirelessGridOpenUsage) {
+        if (RS.INSTANCE.config.wirelessGridUsesEnergy && stack.getItemDamage() != ItemWirelessGrid.TYPE_CREATIVE && RSItems.WIRELESS_GRID.getEnergyStored(stack) <= RS.INSTANCE.config.wirelessGridOpenUsage) {
             return true;
         }
 
         consumers.add(new WirelessGridConsumer(player, stack));
 
-        player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.WIRELESS_GRID, player.worldObj, hand.ordinal(), controllerWorld.provider.getDimension(), 0);
+        player.openGui(RS.INSTANCE, RSGui.WIRELESS_GRID, player.worldObj, hand.ordinal(), controllerWorld.provider.getDimension(), 0);
 
         network.sendItemStorageToClient((EntityPlayerMP) player);
 
-        drainEnergy(player, RefinedStorage.INSTANCE.config.wirelessGridOpenUsage);
+        drainEnergy(player, RS.INSTANCE.config.wirelessGridOpenUsage);
 
         return true;
     }
@@ -83,8 +83,8 @@ public class WirelessGridHandler implements IWirelessGridHandler {
     public void drainEnergy(EntityPlayer player, int energy) {
         IWirelessGridConsumer consumer = getConsumer(player);
 
-        if (consumer != null && RefinedStorage.INSTANCE.config.wirelessGridUsesEnergy) {
-            ItemWirelessGrid item = RefinedStorageItems.WIRELESS_GRID;
+        if (consumer != null && RS.INSTANCE.config.wirelessGridUsesEnergy) {
+            ItemWirelessGrid item = RSItems.WIRELESS_GRID;
 
             if (consumer.getStack().getItemDamage() != ItemWirelessGrid.TYPE_CREATIVE) {
                 item.extractEnergy(consumer.getStack(), energy, false);

src/main/java/refinedstorage/apiimpl/network/grid/ItemGridHandler.java

@@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.ItemHandlerHelper;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.api.autocrafting.task.ICraftingTask;
 import refinedstorage.api.network.INetworkMaster;
 import refinedstorage.api.network.NetworkUtils;
@@ -77,7 +77,7 @@ public class ItemGridHandler implements IItemGridHandler {
                 player.updateHeldItem();
             }
 
-            network.getWirelessGridHandler().drainEnergy(player, RefinedStorage.INSTANCE.config.wirelessGridExtractUsage);
+            network.getWirelessGridHandler().drainEnergy(player, RS.INSTANCE.config.wirelessGridExtractUsage);
         }
     }
 
@@ -85,7 +85,7 @@ public class ItemGridHandler implements IItemGridHandler {
     public ItemStack onInsert(EntityPlayerMP player, ItemStack stack) {
         ItemStack remainder = network.insertItem(stack, stack.stackSize, false);
 
-        network.getWirelessGridHandler().drainEnergy(player, RefinedStorage.INSTANCE.config.wirelessGridInsertUsage);
+        network.getWirelessGridHandler().drainEnergy(player, RS.INSTANCE.config.wirelessGridInsertUsage);
 
         return remainder;
     }
@@ -115,7 +115,7 @@ public class ItemGridHandler implements IItemGridHandler {
 
         player.updateHeldItem();
 
-        network.getWirelessGridHandler().drainEnergy(player, RefinedStorage.INSTANCE.config.wirelessGridInsertUsage);
+        network.getWirelessGridHandler().drainEnergy(player, RS.INSTANCE.config.wirelessGridInsertUsage);
     }
 
     @Override

src/main/java/refinedstorage/apiimpl/solderer/SoldererRecipeFluidStorage.java

@@ -1,8 +1,8 @@
 package refinedstorage.apiimpl.solderer;
 
 import net.minecraft.item.ItemStack;
-import refinedstorage.RefinedStorageBlocks;
-import refinedstorage.RefinedStorageItems;
+import refinedstorage.RSBlocks;
+import refinedstorage.RSItems;
 import refinedstorage.api.solderer.ISoldererRecipe;
 import refinedstorage.block.EnumFluidStorageType;
 import refinedstorage.item.ItemBlockFluidStorage;
@@ -18,9 +18,9 @@ public class SoldererRecipeFluidStorage implements ISoldererRecipe {
     public SoldererRecipeFluidStorage(EnumFluidStorageType type, int storagePart) {
         this.type = type;
         this.rows = new ItemStack[]{
-            new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
-            new ItemStack(RefinedStorageBlocks.MACHINE_CASING),
-            new ItemStack(RefinedStorageItems.FLUID_STORAGE_PART, 1, storagePart)
+                new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
+                new ItemStack(RSBlocks.MACHINE_CASING),
+                new ItemStack(RSItems.FLUID_STORAGE_PART, 1, storagePart)
         };
     }
 
@@ -33,7 +33,7 @@ public class SoldererRecipeFluidStorage implements ISoldererRecipe {
     @Override
     @Nonnull
     public ItemStack getResult() {
-        return ItemBlockFluidStorage.initNBT(new ItemStack(RefinedStorageBlocks.FLUID_STORAGE, 1, type.getId()));
+        return ItemBlockFluidStorage.initNBT(new ItemStack(RSBlocks.FLUID_STORAGE, 1, type.getId()));
     }
 
     @Override

src/main/java/refinedstorage/apiimpl/solderer/SoldererRecipePrintedProcessor.java

@@ -2,7 +2,7 @@ package refinedstorage.apiimpl.solderer;
 
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
-import refinedstorage.RefinedStorageItems;
+import refinedstorage.RSItems;
 import refinedstorage.api.solderer.ISoldererRecipe;
 import refinedstorage.item.ItemProcessor;
 
@@ -16,7 +16,7 @@ public class SoldererRecipePrintedProcessor implements ISoldererRecipe {
 
     public SoldererRecipePrintedProcessor(int type) {
         this.type = type;
-        this.result = new ItemStack(RefinedStorageItems.PROCESSOR, 1, type);
+        this.result = new ItemStack(RSItems.PROCESSOR, 1, type);
 
         switch (type) {
             case ItemProcessor.TYPE_PRINTED_BASIC:
@@ -29,7 +29,7 @@ public class SoldererRecipePrintedProcessor implements ISoldererRecipe {
                 this.requirement = new ItemStack(Items.DIAMOND);
                 break;
             case ItemProcessor.TYPE_PRINTED_SILICON:
-                this.requirement = new ItemStack(RefinedStorageItems.SILICON);
+                this.requirement = new ItemStack(RSItems.SILICON);
                 break;
         }
     }

src/main/java/refinedstorage/apiimpl/solderer/SoldererRecipeProcessor.java

@@ -2,7 +2,7 @@ package refinedstorage.apiimpl.solderer;
 
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
-import refinedstorage.RefinedStorageItems;
+import refinedstorage.RSItems;
 import refinedstorage.api.solderer.ISoldererRecipe;
 import refinedstorage.item.ItemProcessor;
 
@@ -21,21 +21,21 @@ public class SoldererRecipeProcessor implements ISoldererRecipe {
 
         switch (type) {
             case ItemProcessor.TYPE_BASIC:
-                printedProcessor = new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_BASIC);
+                printedProcessor = new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_BASIC);
                 break;
             case ItemProcessor.TYPE_IMPROVED:
-                printedProcessor = new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_IMPROVED);
+                printedProcessor = new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_IMPROVED);
                 break;
             case ItemProcessor.TYPE_ADVANCED:
-                printedProcessor = new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_ADVANCED);
+                printedProcessor = new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_ADVANCED);
                 break;
         }
 
-        this.result = new ItemStack(RefinedStorageItems.PROCESSOR, 1, type);
+        this.result = new ItemStack(RSItems.PROCESSOR, 1, type);
         this.rows = new ItemStack[]{
             printedProcessor,
             new ItemStack(Items.REDSTONE),
-            new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_SILICON)
+                new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_SILICON)
         };
     }
 

src/main/java/refinedstorage/apiimpl/solderer/SoldererRecipeStorage.java

@@ -1,8 +1,8 @@
 package refinedstorage.apiimpl.solderer;
 
 import net.minecraft.item.ItemStack;
-import refinedstorage.RefinedStorageBlocks;
-import refinedstorage.RefinedStorageItems;
+import refinedstorage.RSBlocks;
+import refinedstorage.RSItems;
 import refinedstorage.api.solderer.ISoldererRecipe;
 import refinedstorage.block.EnumItemStorageType;
 import refinedstorage.item.ItemBlockStorage;
@@ -18,9 +18,9 @@ public class SoldererRecipeStorage implements ISoldererRecipe {
     public SoldererRecipeStorage(EnumItemStorageType type, int storagePart) {
         this.type = type;
         this.rows = new ItemStack[]{
-            new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
-            new ItemStack(RefinedStorageBlocks.MACHINE_CASING),
-            new ItemStack(RefinedStorageItems.STORAGE_PART, 1, storagePart)
+                new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
+                new ItemStack(RSBlocks.MACHINE_CASING),
+                new ItemStack(RSItems.STORAGE_PART, 1, storagePart)
         };
     }
 
@@ -33,7 +33,7 @@ public class SoldererRecipeStorage implements ISoldererRecipe {
     @Override
     @Nonnull
     public ItemStack getResult() {
-        return ItemBlockStorage.initNBT(new ItemStack(RefinedStorageBlocks.STORAGE, 1, type.getId()));
+        return ItemBlockStorage.initNBT(new ItemStack(RSBlocks.STORAGE, 1, type.getId()));
     }
 
     @Override

src/main/java/refinedstorage/apiimpl/solderer/SoldererRecipeUpgrade.java

@@ -2,7 +2,7 @@ package refinedstorage.apiimpl.solderer;
 
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
-import refinedstorage.RefinedStorageItems;
+import refinedstorage.RSItems;
 import refinedstorage.api.solderer.ISoldererRecipe;
 import refinedstorage.item.ItemUpgrade;
 
@@ -14,10 +14,10 @@ public class SoldererRecipeUpgrade implements ISoldererRecipe {
     private ItemStack result;
 
     public SoldererRecipeUpgrade(int type) {
-        this.result = new ItemStack(RefinedStorageItems.UPGRADE, 1, type);
+        this.result = new ItemStack(RSItems.UPGRADE, 1, type);
         this.rows = new ItemStack[]{
             ItemUpgrade.getRequirement(type),
-            new ItemStack(RefinedStorageItems.UPGRADE, 1, 0),
+                new ItemStack(RSItems.UPGRADE, 1, 0),
             new ItemStack(Items.REDSTONE)
         };
     }

src/main/java/refinedstorage/apiimpl/storage/NBTStorage.java

@@ -1,7 +1,7 @@
 package refinedstorage.apiimpl.storage;
 
 import net.minecraft.item.ItemStack;
-import refinedstorage.RefinedStorageItems;
+import refinedstorage.RSItems;
 import refinedstorage.apiimpl.storage.fluid.FluidStorageNBT;
 import refinedstorage.apiimpl.storage.item.ItemStorageNBT;
 
@@ -13,9 +13,9 @@ public final class NBTStorage {
             itemStorages[slot] = null;
             fluidStorages[slot] = null;
         } else {
-            if (disk.getItem() == RefinedStorageItems.STORAGE_DISK) {
+            if (disk.getItem() == RSItems.STORAGE_DISK) {
                 itemStorages[slot] = itemStorageSupplier.apply(disk);
-            } else if (disk.getItem() == RefinedStorageItems.FLUID_STORAGE_DISK) {
+            } else if (disk.getItem() == RSItems.FLUID_STORAGE_DISK) {
                 fluidStorages[slot] = fluidStorageNBTSupplier.apply(disk);
             }
         }

src/main/java/refinedstorage/apiimpl/storage/item/GroupedItemStorage.java

@@ -1,7 +1,7 @@
 package refinedstorage.apiimpl.storage.item;
 
 import net.minecraft.item.ItemStack;
-import refinedstorage.api.RefinedStorageAPI;
+import refinedstorage.api.RSAPI;
 import refinedstorage.api.autocrafting.ICraftingPattern;
 import refinedstorage.api.network.INetworkMaster;
 import refinedstorage.api.network.NetworkUtils;
@@ -17,7 +17,7 @@ import java.util.List;
 public class GroupedItemStorage implements IGroupedItemStorage {
     private INetworkMaster network;
     private List<IItemStorage> storages = new ArrayList<>();
-    private IItemStackList list = RefinedStorageAPI.instance().createItemStackList();
+    private IItemStackList list = RSAPI.instance().createItemStackList();
 
     public GroupedItemStorage(INetworkMaster network) {
         this.network = network;

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

@@ -15,7 +15,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.items.IItemHandler;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.item.ItemBlockBase;
 import refinedstorage.tile.TileBase;
 
@@ -30,13 +30,13 @@ public abstract class BlockBase extends Block {
         this.name = name;
 
         setHardness(1.9F);
-        setRegistryName(RefinedStorage.ID, name);
-        setCreativeTab(RefinedStorage.INSTANCE.tab);
+        setRegistryName(RS.ID, name);
+        setCreativeTab(RS.INSTANCE.tab);
     }
 
     @Override
     public String getUnlocalizedName() {
-        return "block." + RefinedStorage.ID + ":" + name;
+        return "block." + RS.ID + ":" + name;
     }
 
     protected BlockStateContainer.Builder createBlockStateBuilder() {

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

@@ -22,7 +22,7 @@ import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.items.IItemHandler;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.api.network.INetworkMaster;
 import refinedstorage.api.network.INetworkNode;
 import refinedstorage.api.network.NetworkUtils;
@@ -66,8 +66,8 @@ public class BlockCable extends BlockCoverable {
         this.name = name;
 
         setHardness(0.6F);
-        setRegistryName(RefinedStorage.ID, name);
-        setCreativeTab(RefinedStorage.INSTANCE.tab);
+        setRegistryName(RS.ID, name);
+        setCreativeTab(RS.INSTANCE.tab);
     }
 
     public BlockCable() {
@@ -76,7 +76,7 @@ public class BlockCable extends BlockCoverable {
 
     @Override
     public String getUnlocalizedName() {
-        return "block." + RefinedStorage.ID + ":" + name;
+        return "block." + RS.ID + ":" + name;
     }
 
     public String getName() {

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

@@ -9,8 +9,8 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageGui;
+import refinedstorage.RS;
+import refinedstorage.RSGui;
 import refinedstorage.tile.TileConstructor;
 
 import java.util.ArrayList;
@@ -85,7 +85,7 @@ public class BlockConstructor extends BlockCable {
         }
 
         if (!world.isRemote) {
-            player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.CONSTRUCTOR, world, pos.getX(), pos.getY(), pos.getZ());
+            player.openGui(RS.INSTANCE, RSGui.CONSTRUCTOR, world, pos.getX(), pos.getY(), pos.getZ());
         }
 
         return true;

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

@@ -17,9 +17,9 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageBlocks;
-import refinedstorage.RefinedStorageGui;
+import refinedstorage.RS;
+import refinedstorage.RSBlocks;
+import refinedstorage.RSGui;
 import refinedstorage.api.network.NetworkUtils;
 import refinedstorage.item.ItemBlockController;
 import refinedstorage.tile.TileController;
@@ -82,7 +82,7 @@ public class BlockController extends BlockBase {
     @Override
     public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
-            player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.CONTROLLER, world, pos.getX(), pos.getY(), pos.getZ());
+            player.openGui(RS.INSTANCE, RSGui.CONTROLLER, world, pos.getX(), pos.getY(), pos.getZ());
         }
 
         return true;
@@ -126,7 +126,7 @@ public class BlockController extends BlockBase {
     public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
         List<ItemStack> drops = new ArrayList<>();
 
-        ItemStack stack = new ItemStack(RefinedStorageBlocks.CONTROLLER, 1, RefinedStorageBlocks.CONTROLLER.getMetaFromState(state));
+        ItemStack stack = new ItemStack(RSBlocks.CONTROLLER, 1, RSBlocks.CONTROLLER.getMetaFromState(state));
 
         stack.setTagCompound(new NBTTagCompound());
         stack.getTagCompound().setInteger(TileController.NBT_ENERGY, ((TileController) world.getTileEntity(pos)).getEnergy().getEnergyStored());

src/main/java/refinedstorage/block/BlockCrafter.java

@@ -8,8 +8,8 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageGui;
+import refinedstorage.RS;
+import refinedstorage.RSGui;
 import refinedstorage.tile.TileCrafter;
 
 public class BlockCrafter extends BlockNode {
@@ -25,7 +25,7 @@ public class BlockCrafter extends BlockNode {
     @Override
     public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
-            player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.CRAFTER, world, pos.getX(), pos.getY(), pos.getZ());
+            player.openGui(RS.INSTANCE, RSGui.CRAFTER, world, pos.getX(), pos.getY(), pos.getZ());
         }
 
         return true;

src/main/java/refinedstorage/block/BlockCraftingMonitor.java

@@ -8,8 +8,8 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageGui;
+import refinedstorage.RS;
+import refinedstorage.RSGui;
 import refinedstorage.tile.TileCraftingMonitor;
 
 public class BlockCraftingMonitor extends BlockNode {
@@ -25,7 +25,7 @@ public class BlockCraftingMonitor extends BlockNode {
     @Override
     public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
-            player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.CRAFTING_MONITOR, world, pos.getX(), pos.getY(), pos.getZ());
+            player.openGui(RS.INSTANCE, RSGui.CRAFTING_MONITOR, world, pos.getX(), pos.getY(), pos.getZ());
         }
 
         return true;

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

@@ -9,9 +9,9 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageBlocks;
-import refinedstorage.RefinedStorageGui;
+import refinedstorage.RS;
+import refinedstorage.RSBlocks;
+import refinedstorage.RSGui;
 import refinedstorage.tile.TileDestructor;
 
 import java.util.List;
@@ -32,7 +32,7 @@ public class BlockDestructor extends BlockCable {
 
     @Override
     public List<AxisAlignedBB> getNonUnionizedCollisionBoxes(IBlockState state) {
-        return RefinedStorageBlocks.CONSTRUCTOR.getNonUnionizedCollisionBoxes(state);
+        return RSBlocks.CONSTRUCTOR.getNonUnionizedCollisionBoxes(state);
     }
 
     @Override
@@ -42,7 +42,7 @@ public class BlockDestructor extends BlockCable {
         }
 
         if (!world.isRemote) {
-            player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DESTRUCTOR, world, pos.getX(), pos.getY(), pos.getZ());
+            player.openGui(RS.INSTANCE, RSGui.DESTRUCTOR, world, pos.getX(), pos.getY(), pos.getZ());
         }
 
         return true;

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

@@ -13,8 +13,8 @@ import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageGui;
+import refinedstorage.RS;
+import refinedstorage.RSGui;
 import refinedstorage.tile.TileDetector;
 
 public class BlockDetector extends BlockNode {
@@ -71,7 +71,7 @@ public class BlockDetector extends BlockNode {
     @Override
     public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
-            player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DETECTOR, world, pos.getX(), pos.getY(), pos.getZ());
+            player.openGui(RS.INSTANCE, RSGui.DETECTOR, world, pos.getX(), pos.getY(), pos.getZ());
         }
 
         return true;

src/main/java/refinedstorage/block/BlockDiskDrive.java

@@ -12,8 +12,8 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageGui;
+import refinedstorage.RS;
+import refinedstorage.RSGui;
 import refinedstorage.tile.TileDiskDrive;
 
 public class BlockDiskDrive extends BlockNode {
@@ -73,7 +73,7 @@ public class BlockDiskDrive extends BlockNode {
     @Override
     public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
-            player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DISK_DRIVE, world, pos.getX(), pos.getY(), pos.getZ());
+            player.openGui(RS.INSTANCE, RSGui.DISK_DRIVE, world, pos.getX(), pos.getY(), pos.getZ());
         }
 
         return true;

src/main/java/refinedstorage/block/BlockDiskManipulator.java

@@ -8,8 +8,8 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageGui;
+import refinedstorage.RS;
+import refinedstorage.RSGui;
 import refinedstorage.tile.TileDiskManipulator;
 
 import javax.annotation.Nullable;
@@ -27,7 +27,7 @@ public class BlockDiskManipulator extends BlockNode {
     @Override
     public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, @Nullable ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
-            player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DISK_MANIPULATOR, world, pos.getX(), pos.getY(), pos.getZ());
+            player.openGui(RS.INSTANCE, RSGui.DISK_MANIPULATOR, world, pos.getX(), pos.getY(), pos.getZ());
         }
 
         return true;

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

@@ -9,8 +9,8 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageGui;
+import refinedstorage.RS;
+import refinedstorage.RSGui;
 import refinedstorage.tile.TileExporter;
 
 import java.util.ArrayList;
@@ -92,7 +92,7 @@ public class BlockExporter extends BlockCable {
         }
 
         if (!world.isRemote) {
-            player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.EXPORTER, world, pos.getX(), pos.getY(), pos.getZ());
+            player.openGui(RS.INSTANCE, RSGui.EXPORTER, world, pos.getX(), pos.getY(), pos.getZ());
         }
 
         return true;

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

@@ -10,8 +10,8 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageGui;
+import refinedstorage.RS;
+import refinedstorage.RSGui;
 import refinedstorage.tile.externalstorage.TileExternalStorage;
 
 import java.util.ArrayList;
@@ -75,7 +75,7 @@ public class BlockExternalStorage extends BlockCable {
         }
 
         if (!world.isRemote) {
-            player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.EXTERNAL_STORAGE, world, pos.getX(), pos.getY(), pos.getZ());
+            player.openGui(RS.INSTANCE, RSGui.EXTERNAL_STORAGE, world, pos.getX(), pos.getY(), pos.getZ());
         }
 
         return true;

src/main/java/refinedstorage/block/BlockFluidInterface.java

@@ -8,8 +8,8 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageGui;
+import refinedstorage.RS;
+import refinedstorage.RSGui;
 import refinedstorage.tile.TileFluidInterface;
 
 public class BlockFluidInterface extends BlockNode {
@@ -25,7 +25,7 @@ public class BlockFluidInterface extends BlockNode {
     @Override
     public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
-            player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.FLUID_INTERFACE, world, pos.getX(), pos.getY(), pos.getZ());
+            player.openGui(RS.INSTANCE, RSGui.FLUID_INTERFACE, world, pos.getX(), pos.getY(), pos.getZ());
         }
 
         return true;

src/main/java/refinedstorage/block/BlockFluidStorage.java

@@ -15,9 +15,9 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageBlocks;
-import refinedstorage.RefinedStorageGui;
+import refinedstorage.RS;
+import refinedstorage.RSBlocks;
+import refinedstorage.RSGui;
 import refinedstorage.item.ItemBlockFluidStorage;
 import refinedstorage.tile.TileFluidStorage;
 
@@ -65,7 +65,7 @@ public class BlockFluidStorage extends BlockNode {
     @Override
     public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
-            player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.FLUID_STORAGE, world, pos.getX(), pos.getY(), pos.getZ());
+            player.openGui(RS.INSTANCE, RSGui.FLUID_STORAGE, world, pos.getX(), pos.getY(), pos.getZ());
         }
 
         return true;
@@ -93,7 +93,7 @@ public class BlockFluidStorage extends BlockNode {
 
         List<ItemStack> drops = new ArrayList<>();
 
-        ItemStack stack = new ItemStack(RefinedStorageBlocks.FLUID_STORAGE, 1, getMetaFromState(state));
+        ItemStack stack = new ItemStack(RSBlocks.FLUID_STORAGE, 1, getMetaFromState(state));
         stack.setTagCompound(new NBTTagCompound());
         stack.getTagCompound().setTag(TileFluidStorage.NBT_STORAGE, storage.getStorageTag());
 

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

@@ -12,8 +12,8 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageGui;
+import refinedstorage.RS;
+import refinedstorage.RSGui;
 import refinedstorage.item.ItemBlockBase;
 import refinedstorage.tile.grid.TileGrid;
 
@@ -58,7 +58,7 @@ public class BlockGrid extends BlockNode {
     @Override
     public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
-            player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.GRID, world, pos.getX(), pos.getY(), pos.getZ());
+            player.openGui(RS.INSTANCE, RSGui.GRID, world, pos.getX(), pos.getY(), pos.getZ());
 
             ((TileGrid) world.getTileEntity(pos)).onGridOpened(player);
         }

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

@@ -9,8 +9,8 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageGui;
+import refinedstorage.RS;
+import refinedstorage.RSGui;
 import refinedstorage.tile.TileImporter;
 
 import java.util.ArrayList;
@@ -96,7 +96,7 @@ public class BlockImporter extends BlockCable {
         }
 
         if (!world.isRemote) {
-            player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.IMPORTER, world, pos.getX(), pos.getY(), pos.getZ());
+            player.openGui(RS.INSTANCE, RSGui.IMPORTER, world, pos.getX(), pos.getY(), pos.getZ());
         }
 
         return true;

src/main/java/refinedstorage/block/BlockInterface.java

@@ -8,8 +8,8 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageGui;
+import refinedstorage.RS;
+import refinedstorage.RSGui;
 import refinedstorage.tile.TileInterface;
 
 public class BlockInterface extends BlockNode {
@@ -25,7 +25,7 @@ public class BlockInterface extends BlockNode {
     @Override
     public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
-            player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.INTERFACE, world, pos.getX(), pos.getY(), pos.getZ());
+            player.openGui(RS.INSTANCE, RSGui.INTERFACE, world, pos.getX(), pos.getY(), pos.getZ());
         }
 
         return true;

src/main/java/refinedstorage/block/BlockNetworkTransmitter.java

@@ -8,8 +8,8 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageGui;
+import refinedstorage.RS;
+import refinedstorage.RSGui;
 import refinedstorage.tile.TileNetworkTransmitter;
 
 public class BlockNetworkTransmitter extends BlockNode {
@@ -20,7 +20,7 @@ public class BlockNetworkTransmitter extends BlockNode {
     @Override
     public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
-            player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.NETWORK_TRANSMITTER, world, pos.getX(), pos.getY(), pos.getZ());
+            player.openGui(RS.INSTANCE, RSGui.NETWORK_TRANSMITTER, world, pos.getX(), pos.getY(), pos.getZ());
         }
 
         return true;

src/main/java/refinedstorage/block/BlockProcessingPatternEncoder.java

@@ -10,8 +10,8 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageGui;
+import refinedstorage.RS;
+import refinedstorage.RSGui;
 import refinedstorage.tile.TileProcessingPatternEncoder;
 
 import java.util.List;
@@ -42,7 +42,7 @@ public class BlockProcessingPatternEncoder extends BlockBase {
     @Override
     public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
-            player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.PROCESSING_PATTERN_ENCODER, world, pos.getX(), pos.getY(), pos.getZ());
+            player.openGui(RS.INSTANCE, RSGui.PROCESSING_PATTERN_ENCODER, world, pos.getX(), pos.getY(), pos.getZ());
         }
 
         return true;

src/main/java/refinedstorage/block/BlockRelay.java

@@ -8,8 +8,8 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageGui;
+import refinedstorage.RS;
+import refinedstorage.RSGui;
 import refinedstorage.tile.TileRelay;
 
 public class BlockRelay extends BlockNode {
@@ -25,7 +25,7 @@ public class BlockRelay extends BlockNode {
     @Override
     public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
-            player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.RELAY, world, pos.getX(), pos.getY(), pos.getZ());
+            player.openGui(RS.INSTANCE, RSGui.RELAY, world, pos.getX(), pos.getY(), pos.getZ());
         }
 
         return true;

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

@@ -10,8 +10,8 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageGui;
+import refinedstorage.RS;
+import refinedstorage.RSGui;
 import refinedstorage.tile.TileSolderer;
 
 import java.util.List;
@@ -40,7 +40,7 @@ public class BlockSolderer extends BlockNode {
     @Override
     public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
-            player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.SOLDERER, world, pos.getX(), pos.getY(), pos.getZ());
+            player.openGui(RS.INSTANCE, RSGui.SOLDERER, world, pos.getX(), pos.getY(), pos.getZ());
         }
 
         return true;

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

@@ -15,9 +15,9 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageBlocks;
-import refinedstorage.RefinedStorageGui;
+import refinedstorage.RS;
+import refinedstorage.RSBlocks;
+import refinedstorage.RSGui;
 import refinedstorage.item.ItemBlockStorage;
 import refinedstorage.tile.TileStorage;
 
@@ -65,7 +65,7 @@ public class BlockStorage extends BlockNode {
     @Override
     public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
-            player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.STORAGE, world, pos.getX(), pos.getY(), pos.getZ());
+            player.openGui(RS.INSTANCE, RSGui.STORAGE, world, pos.getX(), pos.getY(), pos.getZ());
         }
 
         return true;
@@ -93,7 +93,7 @@ public class BlockStorage extends BlockNode {
 
         List<ItemStack> drops = new ArrayList<>();
 
-        ItemStack stack = new ItemStack(RefinedStorageBlocks.STORAGE, 1, getMetaFromState(state));
+        ItemStack stack = new ItemStack(RSBlocks.STORAGE, 1, getMetaFromState(state));
         stack.setTagCompound(new NBTTagCompound());
         stack.getTagCompound().setTag(TileStorage.NBT_STORAGE, storage.getStorageTag());
 

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

@@ -13,8 +13,8 @@ import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageGui;
+import refinedstorage.RS;
+import refinedstorage.RSGui;
 import refinedstorage.tile.TileWirelessTransmitter;
 
 public class BlockWirelessTransmitter extends BlockNode {
@@ -33,7 +33,7 @@ public class BlockWirelessTransmitter extends BlockNode {
     @Override
     public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
-            player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.WIRELESS_TRANSMITTER, world, pos.getX(), pos.getY(), pos.getZ());
+            player.openGui(RS.INSTANCE, RSGui.WIRELESS_TRANSMITTER, world, pos.getX(), pos.getY(), pos.getZ());
         }
 
         return true;

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

@@ -4,7 +4,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.SlotItemHandler;
-import refinedstorage.RefinedStorageItems;
+import refinedstorage.RSItems;
 import refinedstorage.container.slot.SlotOutput;
 import refinedstorage.tile.TileSolderer;
 
@@ -48,7 +48,7 @@ public class ContainerSolderer extends ContainerBase {
                     return null;
                 }
             } else {
-                if (stack.getItem() != RefinedStorageItems.UPGRADE || !mergeItemStack(stack, 4, 4 + 4, false)) {
+                if (stack.getItem() != RSItems.UPGRADE || !mergeItemStack(stack, 4, 4 + 4, false)) {
                     if (!mergeItemStack(stack, 0, 3, false)) { // 0 - 3 because we can't shift click to output slot
                         return null;
                     }

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

@@ -12,7 +12,7 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fml.client.config.GuiCheckBox;
 import net.minecraftforge.items.SlotItemHandler;
 import org.lwjgl.input.Mouse;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.apiimpl.storage.fluid.FluidRenderer;
 import refinedstorage.gui.sidebutton.SideButton;
 import refinedstorage.inventory.ItemHandlerFluid;
@@ -180,7 +180,7 @@ public abstract class GuiBase extends GuiContainer {
     }
 
     public void bindTexture(String file) {
-        bindTexture(RefinedStorage.ID, file);
+        bindTexture(RS.ID, file);
     }
 
     public void bindTexture(String base, String file) {

src/main/java/refinedstorage/gui/GuiCraftingMonitor.java

@@ -2,7 +2,7 @@ package refinedstorage.gui;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.renderer.RenderHelper;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement;
 import refinedstorage.container.ContainerCraftingMonitor;
 import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
@@ -121,10 +121,10 @@ public class GuiCraftingMonitor extends GuiBase {
             ICraftingMonitorElement element = getElements().get(itemSelected);
 
             if (element.getTaskId() != -1) {
-                RefinedStorage.INSTANCE.network.sendToServer(new MessageCraftingMonitorCancel(craftingMonitor, element.getTaskId()));
+                RS.INSTANCE.network.sendToServer(new MessageCraftingMonitorCancel(craftingMonitor, element.getTaskId()));
             }
         } else if (button == cancelAllButton && getElements().size() > 0) {
-            RefinedStorage.INSTANCE.network.sendToServer(new MessageCraftingMonitorCancel(craftingMonitor, -1));
+            RS.INSTANCE.network.sendToServer(new MessageCraftingMonitorCancel(craftingMonitor, -1));
         }
     }
 

src/main/java/refinedstorage/gui/GuiCraftingPreview.java

@@ -6,7 +6,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraftforge.fml.client.FMLClientHandler;
 import org.lwjgl.input.Keyboard;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.network.MessageGridCraftingStart;
 
 import java.io.IOException;
@@ -181,7 +181,7 @@ public class GuiCraftingPreview extends GuiBase {
     }
 
     private void startRequest() {
-        RefinedStorage.INSTANCE.network.sendToServer(new MessageGridCraftingStart(hash, quantity));
+        RS.INSTANCE.network.sendToServer(new MessageGridCraftingStart(hash, quantity));
 
         close();
     }

src/main/java/refinedstorage/gui/GuiGridFilter.java

@@ -2,7 +2,7 @@ package refinedstorage.gui;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraftforge.fml.client.config.GuiCheckBox;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.container.ContainerGridFilter;
 import refinedstorage.item.ItemGridFilter;
@@ -55,6 +55,6 @@ public class GuiGridFilter extends GuiBase {
             compare ^= CompareUtils.COMPARE_NBT;
         }
 
-        RefinedStorage.INSTANCE.network.sendToServer(new MessageGridFilterUpdate(compare));
+        RS.INSTANCE.network.sendToServer(new MessageGridFilterUpdate(compare));
     }
 }

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

@@ -7,7 +7,7 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.common.network.IGuiHandler;
-import refinedstorage.RefinedStorageGui;
+import refinedstorage.RSGui;
 import refinedstorage.container.*;
 import refinedstorage.gui.grid.GuiGrid;
 import refinedstorage.tile.*;
@@ -18,47 +18,47 @@ import refinedstorage.tile.grid.WirelessGrid;
 public class GuiHandler implements IGuiHandler {
     private Container getContainer(int ID, EntityPlayer player, TileEntity tile) {
         switch (ID) {
-            case RefinedStorageGui.CONTROLLER:
+            case RSGui.CONTROLLER:
                 return new ContainerController((TileController) tile, player);
-            case RefinedStorageGui.GRID:
+            case RSGui.GRID:
                 return new ContainerGrid((TileGrid) tile, player);
-            case RefinedStorageGui.DISK_DRIVE:
+            case RSGui.DISK_DRIVE:
                 return new ContainerDiskDrive((TileDiskDrive) tile, player);
-            case RefinedStorageGui.IMPORTER:
+            case RSGui.IMPORTER:
                 return new ContainerImporter((TileImporter) tile, player);
-            case RefinedStorageGui.EXPORTER:
+            case RSGui.EXPORTER:
                 return new ContainerExporter((TileExporter) tile, player);
-            case RefinedStorageGui.DETECTOR:
+            case RSGui.DETECTOR:
                 return new ContainerDetector((TileDetector) tile, player);
-            case RefinedStorageGui.SOLDERER:
+            case RSGui.SOLDERER:
                 return new ContainerSolderer((TileSolderer) tile, player);
-            case RefinedStorageGui.DESTRUCTOR:
+            case RSGui.DESTRUCTOR:
                 return new ContainerDestructor((TileDestructor) tile, player);
-            case RefinedStorageGui.CONSTRUCTOR:
+            case RSGui.CONSTRUCTOR:
                 return new ContainerConstructor((TileConstructor) tile, player);
-            case RefinedStorageGui.STORAGE:
+            case RSGui.STORAGE:
                 return new ContainerStorage((TileStorage) tile, player);
-            case RefinedStorageGui.EXTERNAL_STORAGE:
+            case RSGui.EXTERNAL_STORAGE:
                 return new ContainerExternalStorage((TileExternalStorage) tile, player);
-            case RefinedStorageGui.RELAY:
+            case RSGui.RELAY:
                 return new ContainerRelay((TileRelay) tile, player);
-            case RefinedStorageGui.INTERFACE:
+            case RSGui.INTERFACE:
                 return new ContainerInterface((TileInterface) tile, player);
-            case RefinedStorageGui.CRAFTING_MONITOR:
+            case RSGui.CRAFTING_MONITOR:
                 return new ContainerCraftingMonitor((TileCraftingMonitor) tile, player);
-            case RefinedStorageGui.WIRELESS_TRANSMITTER:
+            case RSGui.WIRELESS_TRANSMITTER:
                 return new ContainerWirelessTransmitter((TileWirelessTransmitter) tile, player);
-            case RefinedStorageGui.CRAFTER:
+            case RSGui.CRAFTER:
                 return new ContainerCrafter((TileCrafter) tile, player);
-            case RefinedStorageGui.PROCESSING_PATTERN_ENCODER:
+            case RSGui.PROCESSING_PATTERN_ENCODER:
                 return new ContainerProcessingPatternEncoder((TileProcessingPatternEncoder) tile, player);
-            case RefinedStorageGui.NETWORK_TRANSMITTER:
+            case RSGui.NETWORK_TRANSMITTER:
                 return new ContainerNetworkTransmitter((TileNetworkTransmitter) tile, player);
-            case RefinedStorageGui.FLUID_INTERFACE:
+            case RSGui.FLUID_INTERFACE:
                 return new ContainerFluidInterface((TileFluidInterface) tile, player);
-            case RefinedStorageGui.FLUID_STORAGE:
+            case RSGui.FLUID_STORAGE:
                 return new ContainerFluidStorage((TileFluidStorage) tile, player);
-            case RefinedStorageGui.DISK_MANIPULATOR:
+            case RSGui.DISK_MANIPULATOR:
                 return new ContainerDiskManipulator((TileDiskManipulator) tile, player);
             default:
                 return null;
@@ -79,9 +79,9 @@ public class GuiHandler implements IGuiHandler {
 
     @Override
     public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
-        if (ID == RefinedStorageGui.WIRELESS_GRID) {
+        if (ID == RSGui.WIRELESS_GRID) {
             return getWirelessGridContainer(player, x, y);
-        } else if (ID == RefinedStorageGui.GRID_FILTER) {
+        } else if (ID == RSGui.GRID_FILTER) {
             return getGridFilterContainer(player, x);
         }
 
@@ -93,51 +93,51 @@ public class GuiHandler implements IGuiHandler {
         TileEntity tile = world.getTileEntity(new BlockPos(x, y, z));
 
         switch (ID) {
-            case RefinedStorageGui.CONTROLLER:
+            case RSGui.CONTROLLER:
                 return new GuiController((ContainerController) getContainer(ID, player, tile), (TileController) tile);
-            case RefinedStorageGui.GRID:
+            case RSGui.GRID:
                 return new GuiGrid((ContainerGrid) getContainer(ID, player, tile), (TileGrid) tile);
-            case RefinedStorageGui.WIRELESS_GRID:
+            case RSGui.WIRELESS_GRID:
                 return getWirelessGridGui(player, x, y);
-            case RefinedStorageGui.DISK_DRIVE:
+            case RSGui.DISK_DRIVE:
                 return new GuiStorage((ContainerDiskDrive) getContainer(ID, player, tile), (IStorageGui) tile, "gui/disk_drive.png");
-            case RefinedStorageGui.IMPORTER:
+            case RSGui.IMPORTER:
                 return new GuiImporter((ContainerImporter) getContainer(ID, player, tile));
-            case RefinedStorageGui.EXPORTER:
+            case RSGui.EXPORTER:
                 return new GuiExporter((ContainerExporter) getContainer(ID, player, tile));
-            case RefinedStorageGui.DETECTOR:
+            case RSGui.DETECTOR:
                 return new GuiDetector((ContainerDetector) getContainer(ID, player, tile));
-            case RefinedStorageGui.SOLDERER:
+            case RSGui.SOLDERER:
                 return new GuiSolderer((ContainerSolderer) getContainer(ID, player, tile), (TileSolderer) tile);
-            case RefinedStorageGui.DESTRUCTOR:
+            case RSGui.DESTRUCTOR:
                 return new GuiDestructor((ContainerDestructor) getContainer(ID, player, tile));
-            case RefinedStorageGui.CONSTRUCTOR:
+            case RSGui.CONSTRUCTOR:
                 return new GuiConstructor((ContainerConstructor) getContainer(ID, player, tile));
-            case RefinedStorageGui.STORAGE:
+            case RSGui.STORAGE:
                 return new GuiStorage((ContainerStorage) getContainer(ID, player, tile), (TileStorage) tile);
-            case RefinedStorageGui.EXTERNAL_STORAGE:
+            case RSGui.EXTERNAL_STORAGE:
                 return new GuiStorage((ContainerExternalStorage) getContainer(ID, player, tile), (TileExternalStorage) tile);
-            case RefinedStorageGui.RELAY:
+            case RSGui.RELAY:
                 return new GuiRelay((ContainerRelay) getContainer(ID, player, tile));
-            case RefinedStorageGui.INTERFACE:
+            case RSGui.INTERFACE:
                 return new GuiInterface((ContainerInterface) getContainer(ID, player, tile));
-            case RefinedStorageGui.CRAFTING_MONITOR:
+            case RSGui.CRAFTING_MONITOR:
                 return new GuiCraftingMonitor((ContainerCraftingMonitor) getContainer(ID, player, tile), (TileCraftingMonitor) tile);
-            case RefinedStorageGui.WIRELESS_TRANSMITTER:
+            case RSGui.WIRELESS_TRANSMITTER:
                 return new GuiWirelessTransmitter((ContainerWirelessTransmitter) getContainer(ID, player, tile));
-            case RefinedStorageGui.CRAFTER:
+            case RSGui.CRAFTER:
                 return new GuiCrafter((ContainerCrafter) getContainer(ID, player, tile));
-            case RefinedStorageGui.PROCESSING_PATTERN_ENCODER:
+            case RSGui.PROCESSING_PATTERN_ENCODER:
                 return new GuiProcessingPatternEncoder((ContainerProcessingPatternEncoder) getContainer(ID, player, tile), (TileProcessingPatternEncoder) tile);
-            case RefinedStorageGui.GRID_FILTER:
+            case RSGui.GRID_FILTER:
                 return new GuiGridFilter(getGridFilterContainer(player, x));
-            case RefinedStorageGui.NETWORK_TRANSMITTER:
+            case RSGui.NETWORK_TRANSMITTER:
                 return new GuiNetworkTransmitter((ContainerNetworkTransmitter) getContainer(ID, player, tile), (TileNetworkTransmitter) tile);
-            case RefinedStorageGui.FLUID_INTERFACE:
+            case RSGui.FLUID_INTERFACE:
                 return new GuiFluidInterface((ContainerFluidInterface) getContainer(ID, player, tile));
-            case RefinedStorageGui.FLUID_STORAGE:
+            case RSGui.FLUID_STORAGE:
                 return new GuiStorage((ContainerFluidStorage) getContainer(ID, player, tile), (TileFluidStorage) tile);
-            case RefinedStorageGui.DISK_MANIPULATOR:
+            case RSGui.DISK_MANIPULATOR:
                 return new GuiDiskManipulator((ContainerDiskManipulator) getContainer(ID, player, tile));
             default:
                 return null;

src/main/java/refinedstorage/gui/GuiProcessingPatternEncoder.java

@@ -2,7 +2,7 @@ package refinedstorage.gui;
 
 import net.minecraft.client.audio.PositionedSoundRecord;
 import net.minecraft.init.SoundEvents;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.container.ContainerProcessingPatternEncoder;
 import refinedstorage.network.MessageGridPatternCreate;
 import refinedstorage.network.MessageProcessingPatternEncoderClear;
@@ -73,11 +73,11 @@ public class GuiProcessingPatternEncoder extends GuiBase {
         super.mouseClicked(mouseX, mouseY, mouseButton);
 
         if (isOverCreatePattern(mouseX - guiLeft, mouseY - guiTop)) {
-            RefinedStorage.INSTANCE.network.sendToServer(new MessageGridPatternCreate(encoder.getPos().getX(), encoder.getPos().getY(), encoder.getPos().getZ()));
+            RS.INSTANCE.network.sendToServer(new MessageGridPatternCreate(encoder.getPos().getX(), encoder.getPos().getY(), encoder.getPos().getZ()));
 
             mc.getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(SoundEvents.UI_BUTTON_CLICK, 1.0F));
         } else if (isOverClear(mouseX - guiLeft, mouseY - guiTop)) {
-            RefinedStorage.INSTANCE.network.sendToServer(new MessageProcessingPatternEncoderClear(encoder));
+            RS.INSTANCE.network.sendToServer(new MessageProcessingPatternEncoderClear(encoder));
 
             mc.getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(SoundEvents.UI_BUTTON_CLICK, 1.0F));
         }

src/main/java/refinedstorage/gui/config/ModGuiConfig.java

@@ -2,16 +2,16 @@ package refinedstorage.gui.config;
 
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraftforge.fml.client.config.GuiConfig;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 
 public class ModGuiConfig extends GuiConfig {
 
     public ModGuiConfig(GuiScreen guiScreen) {
         super(guiScreen,
-                RefinedStorage.INSTANCE.config.getConfigElements(),
-                RefinedStorage.ID,
+                RS.INSTANCE.config.getConfigElements(),
+                RS.ID,
                 false,
                 false,
-                GuiConfig.getAbridgedConfigPath(RefinedStorage.INSTANCE.config.getConfig().toString()));
+                GuiConfig.getAbridgedConfigPath(RS.INSTANCE.config.getConfig().toString()));
     }
 }

src/main/java/refinedstorage/gui/grid/GuiCraftingStart.java

@@ -6,7 +6,7 @@ import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.fml.client.FMLClientHandler;
 import org.lwjgl.input.Keyboard;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.container.ContainerCraftingSettings;
 import refinedstorage.gui.GuiBase;
 import refinedstorage.gui.grid.stack.ClientStackItem;
@@ -124,7 +124,7 @@ public class GuiCraftingStart extends GuiBase {
         Integer quantity = Ints.tryParse(amountField.getText());
 
         if (quantity != null && quantity > 0) {
-            RefinedStorage.INSTANCE.network.sendToServer(new MessageGridCraftingPreview(stack.getHash(), quantity));
+            RS.INSTANCE.network.sendToServer(new MessageGridCraftingPreview(stack.getHash(), quantity));
         }
     }
 

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

@@ -14,7 +14,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fml.common.FMLCommonHandler;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.api.network.grid.IItemGridHandler;
 import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.block.EnumGridType;
@@ -356,16 +356,16 @@ public class GuiGrid extends GuiBase {
         if (clickedCreatePattern) {
             BlockPos gridPos = ((TileGrid) grid).getPos();
 
-            RefinedStorage.INSTANCE.network.sendToServer(new MessageGridPatternCreate(gridPos.getX(), gridPos.getY(), gridPos.getZ()));
+            RS.INSTANCE.network.sendToServer(new MessageGridPatternCreate(gridPos.getX(), gridPos.getY(), gridPos.getZ()));
         } else if (grid.isConnected()) {
             if (clickedClear) {
-                RefinedStorage.INSTANCE.network.sendToServer(new MessageGridCraftingClear((TileGrid) grid));
+                RS.INSTANCE.network.sendToServer(new MessageGridCraftingClear((TileGrid) grid));
             }
 
             ItemStack held = container.getPlayer().inventory.getItemStack();
 
             if (isOverSlotArea(mouseX - guiLeft, mouseY - guiTop) && held != null && (clickedButton == 0 || clickedButton == 1)) {
-                RefinedStorage.INSTANCE.network.sendToServer(grid.getType() == EnumGridType.FLUID ? new MessageGridFluidInsertHeld() : new MessageGridItemInsertHeld(clickedButton == 1));
+                RS.INSTANCE.network.sendToServer(grid.getType() == EnumGridType.FLUID ? new MessageGridFluidInsertHeld() : new MessageGridItemInsertHeld(clickedButton == 1));
             }
 
             if (isOverSlotWithItem()) {
@@ -389,10 +389,10 @@ public class GuiGrid extends GuiBase {
                             flags |= IItemGridHandler.EXTRACT_SINGLE;
                         }
 
-                        RefinedStorage.INSTANCE.network.sendToServer(new MessageGridItemPull(stack.getHash(), flags));
+                        RS.INSTANCE.network.sendToServer(new MessageGridItemPull(stack.getHash(), flags));
                     }
                 } else if (grid.getType() == EnumGridType.FLUID && held == null) {
-                    RefinedStorage.INSTANCE.network.sendToServer(new MessageGridFluidPull(STACKS.get(slotNumber).getHash(), GuiScreen.isShiftKeyDown()));
+                    RS.INSTANCE.network.sendToServer(new MessageGridFluidPull(STACKS.get(slotNumber).getHash(), GuiScreen.isShiftKeyDown()));
                 }
             }
         }

src/main/java/refinedstorage/integration/forgeenergy/WirelessGridEnergyForge.java

@@ -2,7 +2,7 @@ package refinedstorage.integration.forgeenergy;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.energy.IEnergyStorage;
-import refinedstorage.RefinedStorageItems;
+import refinedstorage.RSItems;
 
 public class WirelessGridEnergyForge implements IEnergyStorage {
     private ItemStack stack;
@@ -13,22 +13,22 @@ public class WirelessGridEnergyForge implements IEnergyStorage {
 
     @Override
     public int receiveEnergy(int maxReceive, boolean simulate) {
-        return RefinedStorageItems.WIRELESS_GRID.receiveEnergy(stack, maxReceive, simulate);
+        return RSItems.WIRELESS_GRID.receiveEnergy(stack, maxReceive, simulate);
     }
 
     @Override
     public int extractEnergy(int maxExtract, boolean simulate) {
-        return RefinedStorageItems.WIRELESS_GRID.extractEnergy(stack, maxExtract, simulate);
+        return RSItems.WIRELESS_GRID.extractEnergy(stack, maxExtract, simulate);
     }
 
     @Override
     public int getEnergyStored() {
-        return RefinedStorageItems.WIRELESS_GRID.getEnergyStored(stack);
+        return RSItems.WIRELESS_GRID.getEnergyStored(stack);
     }
 
     @Override
     public int getMaxEnergyStored() {
-        return RefinedStorageItems.WIRELESS_GRID.getMaxEnergyStored(stack);
+        return RSItems.WIRELESS_GRID.getMaxEnergyStored(stack);
     }
 
     @Override

src/main/java/refinedstorage/integration/jei/RecipeMakerSolderer.java

@@ -1,7 +1,7 @@
 package refinedstorage.integration.jei;
 
 import net.minecraft.item.ItemStack;
-import refinedstorage.api.RefinedStorageAPI;
+import refinedstorage.api.RSAPI;
 import refinedstorage.api.solderer.ISoldererRecipe;
 
 import java.util.ArrayList;
@@ -11,7 +11,7 @@ public final class RecipeMakerSolderer {
     public static List<RecipeWrapperSolderer> getRecipes() {
         List<RecipeWrapperSolderer> recipes = new ArrayList<>();
 
-        for (ISoldererRecipe recipe : RefinedStorageAPI.instance().getSoldererRegistry().getRecipes()) {
+        for (ISoldererRecipe recipe : RSAPI.instance().getSoldererRegistry().getRecipes()) {
             List<ItemStack> inputs = new ArrayList<>();
 
             inputs.add(recipe.getRow(0));

src/main/java/refinedstorage/integration/jei/RecipeTransferHandlerGrid.java

@@ -11,7 +11,7 @@ import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.container.ContainerGrid;
 import refinedstorage.network.MessageGridCraftingTransfer;
 
@@ -63,7 +63,7 @@ public class RecipeTransferHandlerGrid implements IRecipeTransferHandler {
                 }
             }
 
-            RefinedStorage.INSTANCE.network.sendToServer(new MessageGridCraftingTransfer(recipe));
+            RS.INSTANCE.network.sendToServer(new MessageGridCraftingTransfer(recipe));
         }
 
         return null;

src/main/java/refinedstorage/integration/jei/RecipeTransferHandlerPattern.java

@@ -6,7 +6,7 @@ import mezz.jei.api.recipe.transfer.IRecipeTransferError;
 import mezz.jei.api.recipe.transfer.IRecipeTransferHandler;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.api.network.NetworkUtils;
 import refinedstorage.container.ContainerProcessingPatternEncoder;
 import refinedstorage.network.MessageProcessingPatternEncoderTransfer;
@@ -55,7 +55,7 @@ public class RecipeTransferHandlerPattern implements IRecipeTransferHandler<Cont
                 }
             }
 
-            RefinedStorage.INSTANCE.network.sendToServer(new MessageProcessingPatternEncoderTransfer(inputs.values(), outputs.values()));
+            RS.INSTANCE.network.sendToServer(new MessageProcessingPatternEncoderTransfer(inputs.values(), outputs.values()));
         }
 
         return null;

src/main/java/refinedstorage/integration/jei/RefinedStorageJEIPlugin.java

@@ -1,8 +1,11 @@
 package refinedstorage.integration.jei;
 
-import mezz.jei.api.*;
+import mezz.jei.api.BlankModPlugin;
+import mezz.jei.api.IJeiRuntime;
+import mezz.jei.api.IModRegistry;
+import mezz.jei.api.JEIPlugin;
 import net.minecraft.item.ItemStack;
-import refinedstorage.RefinedStorageBlocks;
+import refinedstorage.RSBlocks;
 import refinedstorage.container.ContainerSolderer;
 
 @JEIPlugin
@@ -25,7 +28,7 @@ public class RefinedStorageJEIPlugin extends BlankModPlugin {
 
         registry.addRecipes(RecipeMakerSolderer.getRecipes());
 
-        registry.addRecipeCategoryCraftingItem(new ItemStack(RefinedStorageBlocks.SOLDERER), RecipeCategorySolderer.ID);
+        registry.addRecipeCategoryCraftingItem(new ItemStack(RSBlocks.SOLDERER), RecipeCategorySolderer.ID);
     }
 
     @Override

src/main/java/refinedstorage/integration/tesla/WirelessGridEnergyTesla.java

@@ -3,7 +3,7 @@ package refinedstorage.integration.tesla;
 import net.darkhax.tesla.api.ITeslaConsumer;
 import net.darkhax.tesla.api.ITeslaHolder;
 import net.minecraft.item.ItemStack;
-import refinedstorage.RefinedStorageItems;
+import refinedstorage.RSItems;
 
 public class WirelessGridEnergyTesla implements ITeslaHolder, ITeslaConsumer {
     private ItemStack stack;
@@ -14,16 +14,16 @@ public class WirelessGridEnergyTesla implements ITeslaHolder, ITeslaConsumer {
 
     @Override
     public long getStoredPower() {
-        return RefinedStorageItems.WIRELESS_GRID.getEnergyStored(stack);
+        return RSItems.WIRELESS_GRID.getEnergyStored(stack);
     }
 
     @Override
     public long getCapacity() {
-        return RefinedStorageItems.WIRELESS_GRID.getMaxEnergyStored(stack);
+        return RSItems.WIRELESS_GRID.getMaxEnergyStored(stack);
     }
 
     @Override
     public long givePower(long power, boolean simulated) {
-        return RefinedStorageItems.WIRELESS_GRID.receiveEnergy(stack, (int) power, simulated);
+        return RSItems.WIRELESS_GRID.receiveEnergy(stack, (int) power, simulated);
     }
 }

src/main/java/refinedstorage/inventory/IItemValidator.java

@@ -1,18 +1,18 @@
 package refinedstorage.inventory;
 
 import net.minecraft.item.ItemStack;
-import refinedstorage.RefinedStorageItems;
+import refinedstorage.RSItems;
 import refinedstorage.apiimpl.storage.fluid.FluidStorageNBT;
 import refinedstorage.apiimpl.storage.item.ItemStorageNBT;
 
 public interface IItemValidator {
-    IItemValidator ITEM_STORAGE_DISK = new ItemValidatorBasic(RefinedStorageItems.STORAGE_DISK) {
+    IItemValidator ITEM_STORAGE_DISK = new ItemValidatorBasic(RSItems.STORAGE_DISK) {
         @Override
         public boolean isValid(ItemStack disk) {
             return super.isValid(disk) && ItemStorageNBT.isValid(disk);
         }
     };
-    IItemValidator FLUID_STORAGE_DISK = new ItemValidatorBasic(RefinedStorageItems.FLUID_STORAGE_DISK) {
+    IItemValidator FLUID_STORAGE_DISK = new ItemValidatorBasic(RSItems.FLUID_STORAGE_DISK) {
         @Override
         public boolean isValid(ItemStack disk) {
             return super.isValid(disk) && FluidStorageNBT.isValid(disk);

src/main/java/refinedstorage/inventory/ItemHandlerGridFilterInGrid.java

@@ -3,7 +3,7 @@ package refinedstorage.inventory;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.relauncher.Side;
-import refinedstorage.RefinedStorageItems;
+import refinedstorage.RSItems;
 import refinedstorage.gui.grid.GridFilteredItem;
 import refinedstorage.gui.grid.GuiGrid;
 import refinedstorage.item.ItemGridFilter;
@@ -14,7 +14,7 @@ public class ItemHandlerGridFilterInGrid extends ItemHandlerBasic {
     private List<GridFilteredItem> filteredItems;
 
     public ItemHandlerGridFilterInGrid(List<GridFilteredItem> filteredItems) {
-        super(4, new ItemValidatorBasic(RefinedStorageItems.GRID_FILTER));
+        super(4, new ItemValidatorBasic(RSItems.GRID_FILTER));
 
         this.filteredItems = filteredItems;
     }

src/main/java/refinedstorage/inventory/ItemHandlerUpgrade.java

@@ -1,7 +1,7 @@
 package refinedstorage.inventory;
 
 import net.minecraft.tileentity.TileEntity;
-import refinedstorage.RefinedStorageItems;
+import refinedstorage.RSItems;
 import refinedstorage.item.ItemUpgrade;
 
 public class ItemHandlerUpgrade extends ItemHandlerBasic {
@@ -9,7 +9,7 @@ public class ItemHandlerUpgrade extends ItemHandlerBasic {
         super(size, tile, new IItemValidator[supportedUpgrades.length]);
 
         for (int i = 0; i < supportedUpgrades.length; ++i) {
-            this.validators[i] = new ItemValidatorBasic(RefinedStorageItems.UPGRADE, supportedUpgrades[i]);
+            this.validators[i] = new ItemValidatorBasic(RSItems.UPGRADE, supportedUpgrades[i]);
         }
     }
 

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

@@ -2,7 +2,7 @@ package refinedstorage.item;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 
 public abstract class ItemBase extends Item {
     private String name;
@@ -10,13 +10,13 @@ public abstract class ItemBase extends Item {
     public ItemBase(String name) {
         this.name = name;
 
-        setRegistryName(RefinedStorage.ID, name);
-        setCreativeTab(RefinedStorage.INSTANCE.tab);
+        setRegistryName(RS.ID, name);
+        setCreativeTab(RS.INSTANCE.tab);
     }
 
     @Override
     public String getUnlocalizedName() {
-        return "item." + RefinedStorage.ID + ":" + name;
+        return "item." + RS.ID + ":" + name;
     }
 
     @Override

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

@@ -5,8 +5,8 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageBlocks;
+import refinedstorage.RS;
+import refinedstorage.RSBlocks;
 import refinedstorage.block.EnumControllerType;
 import refinedstorage.tile.TileController;
 
@@ -14,7 +14,7 @@ import java.util.List;
 
 public class ItemBlockController extends ItemBlockBase {
     public ItemBlockController() {
-        super(RefinedStorageBlocks.CONTROLLER, RefinedStorageBlocks.CONTROLLER.getPlacementType(), true);
+        super(RSBlocks.CONTROLLER, RSBlocks.CONTROLLER.getPlacementType(), true);
     }
 
     @Override
@@ -29,7 +29,7 @@ public class ItemBlockController extends ItemBlockBase {
     }
 
     public static int getEnergyCapacity(ItemStack stack) {
-        return (stack.hasTagCompound() && stack.getTagCompound().hasKey(TileController.NBT_ENERGY_CAPACITY)) ? stack.getTagCompound().getInteger(TileController.NBT_ENERGY_CAPACITY) : RefinedStorage.INSTANCE.config.controllerCapacity;
+        return (stack.hasTagCompound() && stack.getTagCompound().hasKey(TileController.NBT_ENERGY_CAPACITY)) ? stack.getTagCompound().getInteger(TileController.NBT_ENERGY_CAPACITY) : RS.INSTANCE.config.controllerCapacity;
     }
 
     @Override
@@ -46,7 +46,7 @@ public class ItemBlockController extends ItemBlockBase {
             tag = new NBTTagCompound();
         }
 
-        tag.setInteger(TileController.NBT_ENERGY, stack.getMetadata() == EnumControllerType.CREATIVE.getId() ? RefinedStorage.INSTANCE.config.controllerCapacity : 0);
+        tag.setInteger(TileController.NBT_ENERGY, stack.getMetadata() == EnumControllerType.CREATIVE.getId() ? RS.INSTANCE.config.controllerCapacity : 0);
 
         return stack;
     }

src/main/java/refinedstorage/item/ItemBlockFluidStorage.java

@@ -10,8 +10,8 @@ import net.minecraft.util.ActionResult;
 import net.minecraft.util.EnumActionResult;
 import net.minecraft.util.EnumHand;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorageBlocks;
-import refinedstorage.RefinedStorageItems;
+import refinedstorage.RSBlocks;
+import refinedstorage.RSItems;
 import refinedstorage.apiimpl.storage.fluid.FluidStorageNBT;
 import refinedstorage.block.EnumFluidStorageType;
 import refinedstorage.tile.TileFluidStorage;
@@ -20,7 +20,7 @@ import java.util.List;
 
 public class ItemBlockFluidStorage extends ItemBlockBase {
     public ItemBlockFluidStorage() {
-        super(RefinedStorageBlocks.FLUID_STORAGE, RefinedStorageBlocks.FLUID_STORAGE.getPlacementType(), true);
+        super(RSBlocks.FLUID_STORAGE, RSBlocks.FLUID_STORAGE.getPlacementType(), true);
     }
 
     @Override
@@ -43,19 +43,19 @@ public class ItemBlockFluidStorage extends ItemBlockBase {
         EnumFluidStorageType type = EnumFluidStorageType.getById(stack.getMetadata());
 
         if (type != null && stack.stackSize == 1 && isValid(stack) && FluidStorageNBT.getStoredFromNBT(stack.getTagCompound().getCompoundTag(TileFluidStorage.NBT_STORAGE)) == 0 && stack.getMetadata() != ItemFluidStorageDisk.TYPE_CREATIVE && !world.isRemote && player.isSneaking()) {
-            ItemStack storagePart = new ItemStack(RefinedStorageItems.FLUID_STORAGE_PART, 1, stack.getMetadata());
+            ItemStack storagePart = new ItemStack(RSItems.FLUID_STORAGE_PART, 1, stack.getMetadata());
 
             if (!player.inventory.addItemStackToInventory(storagePart.copy())) {
                 InventoryHelper.spawnItemStack(world, player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), storagePart);
             }
 
-            ItemStack processor = new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC);
+            ItemStack processor = new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC);
 
             if (!player.inventory.addItemStackToInventory(processor.copy())) {
                 InventoryHelper.spawnItemStack(world, player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), processor);
             }
 
-            return new ActionResult<>(EnumActionResult.SUCCESS, new ItemStack(RefinedStorageBlocks.MACHINE_CASING));
+            return new ActionResult<>(EnumActionResult.SUCCESS, new ItemStack(RSBlocks.MACHINE_CASING));
         }
 
         return new ActionResult<>(EnumActionResult.PASS, stack);

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

@@ -10,8 +10,8 @@ import net.minecraft.util.ActionResult;
 import net.minecraft.util.EnumActionResult;
 import net.minecraft.util.EnumHand;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorageBlocks;
-import refinedstorage.RefinedStorageItems;
+import refinedstorage.RSBlocks;
+import refinedstorage.RSItems;
 import refinedstorage.apiimpl.storage.item.ItemStorageNBT;
 import refinedstorage.block.EnumItemStorageType;
 import refinedstorage.tile.TileStorage;
@@ -20,7 +20,7 @@ import java.util.List;
 
 public class ItemBlockStorage extends ItemBlockBase {
     public ItemBlockStorage() {
-        super(RefinedStorageBlocks.STORAGE, RefinedStorageBlocks.STORAGE.getPlacementType(), true);
+        super(RSBlocks.STORAGE, RSBlocks.STORAGE.getPlacementType(), true);
     }
 
     @Override
@@ -43,19 +43,19 @@ public class ItemBlockStorage extends ItemBlockBase {
         EnumItemStorageType type = EnumItemStorageType.getById(stack.getMetadata());
 
         if (type != null && stack.stackSize == 1 && isValid(stack) && ItemStorageNBT.getStoredFromNBT(stack.getTagCompound().getCompoundTag(TileStorage.NBT_STORAGE)) == 0 && stack.getMetadata() != ItemStorageDisk.TYPE_CREATIVE && !world.isRemote && player.isSneaking()) {
-            ItemStack storagePart = new ItemStack(RefinedStorageItems.STORAGE_PART, 1, stack.getMetadata());
+            ItemStack storagePart = new ItemStack(RSItems.STORAGE_PART, 1, stack.getMetadata());
 
             if (!player.inventory.addItemStackToInventory(storagePart.copy())) {
                 InventoryHelper.spawnItemStack(world, player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), storagePart);
             }
 
-            ItemStack processor = new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC);
+            ItemStack processor = new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC);
 
             if (!player.inventory.addItemStackToInventory(processor.copy())) {
                 InventoryHelper.spawnItemStack(world, player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), processor);
             }
 
-            return new ActionResult<>(EnumActionResult.SUCCESS, new ItemStack(RefinedStorageBlocks.MACHINE_CASING));
+            return new ActionResult<>(EnumActionResult.SUCCESS, new ItemStack(RSBlocks.MACHINE_CASING));
         }
 
         return new ActionResult<>(EnumActionResult.PASS, stack);

src/main/java/refinedstorage/item/ItemFluidStorageDisk.java

@@ -15,7 +15,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
-import refinedstorage.RefinedStorageItems;
+import refinedstorage.RSItems;
 import refinedstorage.apiimpl.storage.fluid.FluidStorageNBT;
 import refinedstorage.block.EnumFluidStorageType;
 
@@ -83,13 +83,13 @@ public class ItemFluidStorageDisk extends ItemBase {
     @Override
     public ActionResult<ItemStack> onItemRightClick(ItemStack disk, World world, EntityPlayer player, EnumHand hand) {
         if (!world.isRemote && player.isSneaking() && FluidStorageNBT.isValid(disk) && FluidStorageNBT.getStoredFromNBT(disk.getTagCompound()) == 0 && disk.getMetadata() != TYPE_CREATIVE) {
-            ItemStack storagePart = new ItemStack(RefinedStorageItems.FLUID_STORAGE_PART, 1, disk.getMetadata());
+            ItemStack storagePart = new ItemStack(RSItems.FLUID_STORAGE_PART, 1, disk.getMetadata());
 
             if (!player.inventory.addItemStackToInventory(storagePart.copy())) {
                 InventoryHelper.spawnItemStack(world, player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), storagePart);
             }
 
-            return new ActionResult<>(EnumActionResult.SUCCESS, new ItemStack(RefinedStorageItems.STORAGE_HOUSING));
+            return new ActionResult<>(EnumActionResult.SUCCESS, new ItemStack(RSItems.STORAGE_HOUSING));
         }
 
         return new ActionResult<>(EnumActionResult.PASS, disk);

src/main/java/refinedstorage/item/ItemGridFilter.java

@@ -7,9 +7,9 @@ import net.minecraft.util.ActionResult;
 import net.minecraft.util.EnumActionResult;
 import net.minecraft.util.EnumHand;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageGui;
-import refinedstorage.RefinedStorageItems;
+import refinedstorage.RS;
+import refinedstorage.RSGui;
+import refinedstorage.RSItems;
 import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.inventory.ItemHandlerGridFilter;
 
@@ -28,10 +28,10 @@ public class ItemGridFilter extends ItemBase {
     public ActionResult<ItemStack> onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) {
         if (!world.isRemote) {
             if (player.isSneaking()) {
-                return new ActionResult<>(EnumActionResult.SUCCESS, new ItemStack(RefinedStorageItems.GRID_FILTER));
+                return new ActionResult<>(EnumActionResult.SUCCESS, new ItemStack(RSItems.GRID_FILTER));
             }
 
-            player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.GRID_FILTER, world, hand.ordinal(), 0, 0);
+            player.openGui(RS.INSTANCE, RSGui.GRID_FILTER, world, hand.ordinal(), 0, 0);
 
             return new ActionResult<>(EnumActionResult.SUCCESS, stack);
         }

src/main/java/refinedstorage/item/ItemNetworkCard.java

@@ -10,7 +10,7 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorageBlocks;
+import refinedstorage.RSBlocks;
 
 import java.util.List;
 
@@ -30,7 +30,7 @@ public class ItemNetworkCard extends ItemBase {
     public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
         Block block = world.getBlockState(pos).getBlock();
 
-        if (block == RefinedStorageBlocks.NETWORK_RECEIVER) {
+        if (block == RSBlocks.NETWORK_RECEIVER) {
             setReceiver(stack, pos, world.provider.getDimension());
 
             return EnumActionResult.SUCCESS;

src/main/java/refinedstorage/item/ItemPattern.java

@@ -13,7 +13,7 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.Constants;
-import refinedstorage.RefinedStorageItems;
+import refinedstorage.RSItems;
 import refinedstorage.api.autocrafting.ICraftingPattern;
 import refinedstorage.api.autocrafting.ICraftingPatternContainer;
 import refinedstorage.api.autocrafting.ICraftingPatternProvider;
@@ -175,7 +175,7 @@ public class ItemPattern extends ItemBase implements ICraftingPatternProvider {
     @Override
     public ActionResult<ItemStack> onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) {
         if (!world.isRemote && player.isSneaking()) {
-            return new ActionResult<>(EnumActionResult.SUCCESS, new ItemStack(RefinedStorageItems.PATTERN, stack.stackSize));
+            return new ActionResult<>(EnumActionResult.SUCCESS, new ItemStack(RSItems.PATTERN, stack.stackSize));
         }
 
         return new ActionResult<>(EnumActionResult.PASS, stack);

src/main/java/refinedstorage/item/ItemStorageDisk.java

@@ -12,7 +12,7 @@ import net.minecraft.util.ActionResult;
 import net.minecraft.util.EnumActionResult;
 import net.minecraft.util.EnumHand;
 import net.minecraft.world.World;
-import refinedstorage.RefinedStorageItems;
+import refinedstorage.RSItems;
 import refinedstorage.apiimpl.storage.item.ItemStorageNBT;
 import refinedstorage.block.EnumItemStorageType;
 
@@ -74,7 +74,7 @@ public class ItemStorageDisk extends ItemBase {
             while (it.hasNext()) {
                 Item item = it.next();
 
-                if (item != RefinedStorageItems.STORAGE_DISK) {
+                if (item != RSItems.STORAGE_DISK) {
                     List<ItemStack> stacks = new ArrayList<>();
 
                     item.getSubItems(item, CreativeTabs.INVENTORY, stacks);
@@ -107,13 +107,13 @@ public class ItemStorageDisk extends ItemBase {
     @Override
     public ActionResult<ItemStack> onItemRightClick(ItemStack disk, World world, EntityPlayer player, EnumHand hand) {
         if (!world.isRemote && player.isSneaking() && ItemStorageNBT.isValid(disk) && ItemStorageNBT.getStoredFromNBT(disk.getTagCompound()) == 0 && disk.getMetadata() != TYPE_CREATIVE) {
-            ItemStack storagePart = new ItemStack(RefinedStorageItems.STORAGE_PART, 1, disk.getMetadata());
+            ItemStack storagePart = new ItemStack(RSItems.STORAGE_PART, 1, disk.getMetadata());
 
             if (!player.inventory.addItemStackToInventory(storagePart.copy())) {
                 InventoryHelper.spawnItemStack(world, player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), storagePart);
             }
 
-            return new ActionResult<>(EnumActionResult.SUCCESS, new ItemStack(RefinedStorageItems.STORAGE_HOUSING));
+            return new ActionResult<>(EnumActionResult.SUCCESS, new ItemStack(RSItems.STORAGE_HOUSING));
         }
 
         return new ActionResult<>(EnumActionResult.PASS, disk);

src/main/java/refinedstorage/item/ItemUpgrade.java

@@ -5,7 +5,7 @@ import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 
 import java.util.List;
 
@@ -34,15 +34,15 @@ public class ItemUpgrade extends ItemBase {
     public static int getEnergyUsage(int type) {
         switch (type) {
             case TYPE_RANGE:
-                return RefinedStorage.INSTANCE.config.rangeUpgradeUsage;
+                return RS.INSTANCE.config.rangeUpgradeUsage;
             case TYPE_SPEED:
-                return RefinedStorage.INSTANCE.config.speedUpgradeUsage;
+                return RS.INSTANCE.config.speedUpgradeUsage;
             case TYPE_CRAFTING:
-                return RefinedStorage.INSTANCE.config.craftingUpgradeUsage;
+                return RS.INSTANCE.config.craftingUpgradeUsage;
             case TYPE_STACK:
-                return RefinedStorage.INSTANCE.config.stackUpgradeUsage;
+                return RS.INSTANCE.config.stackUpgradeUsage;
             case TYPE_INTERDIMENSIONAL:
-                return RefinedStorage.INSTANCE.config.interdimensionalUpgradeUsage;
+                return RS.INSTANCE.config.interdimensionalUpgradeUsage;
             default:
                 return 0;
         }

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

@@ -22,8 +22,8 @@ import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.capabilities.ICapabilityProvider;
 import net.minecraftforge.energy.CapabilityEnergy;
 import net.minecraftforge.fml.common.Optional;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageBlocks;
+import refinedstorage.RS;
+import refinedstorage.RSBlocks;
 import refinedstorage.integration.forgeenergy.WirelessGridEnergyForge;
 import refinedstorage.integration.ic2.IntegrationIC2;
 import refinedstorage.integration.tesla.IntegrationTesla;
@@ -50,11 +50,11 @@ public class ItemWirelessGrid extends ItemEnergyContainer implements ISpecialEle
     public ItemWirelessGrid() {
         super(3200);
 
-        setRegistryName(RefinedStorage.ID, "wireless_grid");
+        setRegistryName(RS.ID, "wireless_grid");
         setMaxDamage(3200);
         setMaxStackSize(1);
         setHasSubtypes(true);
-        setCreativeTab(RefinedStorage.INSTANCE.tab);
+        setCreativeTab(RS.INSTANCE.tab);
         addPropertyOverride(new ResourceLocation("connected"), (stack, world, entity) -> (entity != null && isValid(stack)) ? 1.0f : 0.0f);
     }
 
@@ -116,7 +116,7 @@ public class ItemWirelessGrid extends ItemEnergyContainer implements ISpecialEle
     public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
         Block block = world.getBlockState(pos).getBlock();
 
-        if (block == RefinedStorageBlocks.CONTROLLER) {
+        if (block == RSBlocks.CONTROLLER) {
             NBTTagCompound tag = stack.getTagCompound();
 
             if (tag == null) {
@@ -220,7 +220,7 @@ public class ItemWirelessGrid extends ItemEnergyContainer implements ISpecialEle
 
     @Override
     public String getUnlocalizedName() {
-        return "item." + RefinedStorage.ID + ":wireless_grid";
+        return "item." + RS.ID + ":wireless_grid";
     }
 
     @Override

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

@@ -24,9 +24,9 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.eventhandler.EventPriority;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import org.lwjgl.opengl.GL11;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageBlocks;
-import refinedstorage.RefinedStorageItems;
+import refinedstorage.RS;
+import refinedstorage.RSBlocks;
+import refinedstorage.RSItems;
 import refinedstorage.block.*;
 import refinedstorage.item.*;
 import refinedstorage.tile.TileController;
@@ -38,12 +38,12 @@ public class ClientProxy extends CommonProxy {
     public void onModelBake(ModelBakeEvent e) {
         for (ModelResourceLocation model : e.getModelRegistry().getKeys()) {
             for (BlockCable cable : cableTypes) {
-                if (model.getResourceDomain().equals(RefinedStorage.ID) && model.getResourcePath().equals(cable.getName()) && !model.getVariant().equals("inventory")) {
+                if (model.getResourceDomain().equals(RS.ID) && model.getResourcePath().equals(cable.getName()) && !model.getVariant().equals("inventory")) {
                     e.getModelRegistry().putObject(model, ModelMultipartContainer.fromBlock(e.getModelRegistry().getObject(model), cable));
                 }
             }
 
-            if (model.getResourceDomain().equals(RefinedStorage.ID) && model.getResourcePath().equals("pattern")) {
+            if (model.getResourceDomain().equals(RS.ID) && model.getResourcePath().equals("pattern")) {
                 e.getModelRegistry().putObject(model, new PatternBakedModel(e.getModelRegistry().getObject(model)));
             }
         }
@@ -147,7 +147,7 @@ public class ClientProxy extends CommonProxy {
         MinecraftForge.EVENT_BUS.register(this);
 
         // Item Variants
-        ModelBakery.registerItemVariants(RefinedStorageItems.STORAGE_DISK,
+        ModelBakery.registerItemVariants(RSItems.STORAGE_DISK,
                 new ResourceLocation("refinedstorage:1k_storage_disk"),
                 new ResourceLocation("refinedstorage:4k_storage_disk"),
                 new ResourceLocation("refinedstorage:16k_storage_disk"),
@@ -155,14 +155,14 @@ public class ClientProxy extends CommonProxy {
                 new ResourceLocation("refinedstorage:creative_storage_disk")
         );
 
-        ModelBakery.registerItemVariants(RefinedStorageItems.STORAGE_PART,
+        ModelBakery.registerItemVariants(RSItems.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.FLUID_STORAGE_DISK,
+        ModelBakery.registerItemVariants(RSItems.FLUID_STORAGE_DISK,
                 new ResourceLocation("refinedstorage:64k_fluid_storage_disk"),
                 new ResourceLocation("refinedstorage:128k_fluid_storage_disk"),
                 new ResourceLocation("refinedstorage:256k_fluid_storage_disk"),
@@ -170,14 +170,14 @@ public class ClientProxy extends CommonProxy {
                 new ResourceLocation("refinedstorage:creative_fluid_storage_disk")
         );
 
-        ModelBakery.registerItemVariants(RefinedStorageItems.FLUID_STORAGE_PART,
+        ModelBakery.registerItemVariants(RSItems.FLUID_STORAGE_PART,
                 new ResourceLocation("refinedstorage:64k_fluid_storage_part"),
                 new ResourceLocation("refinedstorage:128k_fluid_storage_part"),
                 new ResourceLocation("refinedstorage:256k_fluid_storage_part"),
                 new ResourceLocation("refinedstorage:512k_fluid_storage_part")
         );
 
-        ModelBakery.registerItemVariants(RefinedStorageItems.PROCESSOR,
+        ModelBakery.registerItemVariants(RSItems.PROCESSOR,
                 new ResourceLocation("refinedstorage:basic_printed_processor"),
                 new ResourceLocation("refinedstorage:improved_printed_processor"),
                 new ResourceLocation("refinedstorage:advanced_printed_processor"),
@@ -187,12 +187,12 @@ public class ClientProxy extends CommonProxy {
                 new ResourceLocation("refinedstorage:printed_silicon")
         );
 
-        ModelBakery.registerItemVariants(RefinedStorageItems.CORE,
+        ModelBakery.registerItemVariants(RSItems.CORE,
                 new ResourceLocation("refinedstorage:construction_core"),
                 new ResourceLocation("refinedstorage:destruction_core")
         );
 
-        ModelBakery.registerItemVariants(RefinedStorageItems.UPGRADE,
+        ModelBakery.registerItemVariants(RSItems.UPGRADE,
                 new ResourceLocation("refinedstorage:upgrade"),
                 new ResourceLocation("refinedstorage:range_upgrade"),
                 new ResourceLocation("refinedstorage:speed_upgrade"),
@@ -201,94 +201,94 @@ public class ClientProxy extends CommonProxy {
         );
 
         // Items
-        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_DISK, ItemStorageDisk.TYPE_1K, new ModelResourceLocation("refinedstorage:1k_storage_disk", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_DISK, ItemStorageDisk.TYPE_4K, new ModelResourceLocation("refinedstorage:4k_storage_disk", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_DISK, ItemStorageDisk.TYPE_16K, new ModelResourceLocation("refinedstorage:16k_storage_disk", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_DISK, ItemStorageDisk.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_storage_disk", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_DISK, ItemStorageDisk.TYPE_CREATIVE, new ModelResourceLocation("refinedstorage:creative_storage_disk", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.STORAGE_DISK, ItemStorageDisk.TYPE_1K, new ModelResourceLocation("refinedstorage:1k_storage_disk", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.STORAGE_DISK, ItemStorageDisk.TYPE_4K, new ModelResourceLocation("refinedstorage:4k_storage_disk", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.STORAGE_DISK, ItemStorageDisk.TYPE_16K, new ModelResourceLocation("refinedstorage:16k_storage_disk", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.STORAGE_DISK, ItemStorageDisk.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_storage_disk", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.STORAGE_DISK, ItemStorageDisk.TYPE_CREATIVE, new ModelResourceLocation("refinedstorage:creative_storage_disk", "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(RSItems.STORAGE_PART, ItemStoragePart.TYPE_1K, new ModelResourceLocation("refinedstorage:1k_storage_part", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.STORAGE_PART, ItemStoragePart.TYPE_4K, new ModelResourceLocation("refinedstorage:4k_storage_part", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.STORAGE_PART, ItemStoragePart.TYPE_16K, new ModelResourceLocation("refinedstorage:16k_storage_part", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.STORAGE_PART, ItemStoragePart.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_storage_part", "inventory"));
 
-        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.FLUID_STORAGE_DISK, ItemFluidStorageDisk.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_fluid_storage_disk", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.FLUID_STORAGE_DISK, ItemFluidStorageDisk.TYPE_128K, new ModelResourceLocation("refinedstorage:128k_fluid_storage_disk", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.FLUID_STORAGE_DISK, ItemFluidStorageDisk.TYPE_256K, new ModelResourceLocation("refinedstorage:256k_fluid_storage_disk", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.FLUID_STORAGE_DISK, ItemFluidStorageDisk.TYPE_512K, new ModelResourceLocation("refinedstorage:512k_fluid_storage_disk", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.FLUID_STORAGE_DISK, ItemFluidStorageDisk.TYPE_CREATIVE, new ModelResourceLocation("refinedstorage:creative_fluid_storage_disk", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.FLUID_STORAGE_DISK, ItemFluidStorageDisk.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_fluid_storage_disk", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.FLUID_STORAGE_DISK, ItemFluidStorageDisk.TYPE_128K, new ModelResourceLocation("refinedstorage:128k_fluid_storage_disk", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.FLUID_STORAGE_DISK, ItemFluidStorageDisk.TYPE_256K, new ModelResourceLocation("refinedstorage:256k_fluid_storage_disk", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.FLUID_STORAGE_DISK, ItemFluidStorageDisk.TYPE_512K, new ModelResourceLocation("refinedstorage:512k_fluid_storage_disk", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.FLUID_STORAGE_DISK, ItemFluidStorageDisk.TYPE_CREATIVE, new ModelResourceLocation("refinedstorage:creative_fluid_storage_disk", "inventory"));
 
-        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.FLUID_STORAGE_PART, ItemFluidStoragePart.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_fluid_storage_part", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.FLUID_STORAGE_PART, ItemFluidStoragePart.TYPE_128K, new ModelResourceLocation("refinedstorage:128k_fluid_storage_part", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.FLUID_STORAGE_PART, ItemFluidStoragePart.TYPE_256K, new ModelResourceLocation("refinedstorage:256k_fluid_storage_part", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.FLUID_STORAGE_PART, ItemFluidStoragePart.TYPE_512K, new ModelResourceLocation("refinedstorage:512k_fluid_storage_part", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.FLUID_STORAGE_PART, ItemFluidStoragePart.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_fluid_storage_part", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.FLUID_STORAGE_PART, ItemFluidStoragePart.TYPE_128K, new ModelResourceLocation("refinedstorage:128k_fluid_storage_part", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.FLUID_STORAGE_PART, ItemFluidStoragePart.TYPE_256K, new ModelResourceLocation("refinedstorage:256k_fluid_storage_part", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.FLUID_STORAGE_PART, ItemFluidStoragePart.TYPE_512K, new ModelResourceLocation("refinedstorage:512k_fluid_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(RSItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_BASIC, new ModelResourceLocation("refinedstorage:basic_printed_processor", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_IMPROVED, new ModelResourceLocation("refinedstorage:improved_printed_processor", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_ADVANCED, new ModelResourceLocation("refinedstorage:advanced_printed_processor", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.PROCESSOR, ItemProcessor.TYPE_BASIC, new ModelResourceLocation("refinedstorage:basic_processor", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.PROCESSOR, ItemProcessor.TYPE_IMPROVED, new ModelResourceLocation("refinedstorage:improved_processor", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.PROCESSOR, ItemProcessor.TYPE_ADVANCED, new ModelResourceLocation("refinedstorage:advanced_processor", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.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(RSItems.SILICON, 0, new ModelResourceLocation("refinedstorage:silicon", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.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(RSItems.CORE, ItemCore.TYPE_CONSTRUCTION, new ModelResourceLocation("refinedstorage:construction_core", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.CORE, ItemCore.TYPE_DESTRUCTION, new ModelResourceLocation("refinedstorage:destruction_core", "inventory"));
 
-        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.WIRELESS_GRID, 0, new ModelResourceLocation("refinedstorage:wireless_grid", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PATTERN, 0, new ModelResourceLocation("refinedstorage:pattern", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_HOUSING, 0, new ModelResourceLocation("refinedstorage:storage_housing", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.GRID_FILTER, 0, new ModelResourceLocation("refinedstorage:grid_filter", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.NETWORK_CARD, 0, new ModelResourceLocation("refinedstorage:network_card", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.WIRELESS_GRID, 0, new ModelResourceLocation("refinedstorage:wireless_grid", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.PATTERN, 0, new ModelResourceLocation("refinedstorage:pattern", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.STORAGE_HOUSING, 0, new ModelResourceLocation("refinedstorage:storage_housing", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.GRID_FILTER, 0, new ModelResourceLocation("refinedstorage:grid_filter", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.NETWORK_CARD, 0, new ModelResourceLocation("refinedstorage:network_card", "inventory"));
 
-        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.UPGRADE, 0, new ModelResourceLocation("refinedstorage:upgrade", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_RANGE, new ModelResourceLocation("refinedstorage:range_upgrade", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_SPEED, new ModelResourceLocation("refinedstorage:speed_upgrade", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_CRAFTING, new ModelResourceLocation("refinedstorage:crafting_upgrade", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_STACK, new ModelResourceLocation("refinedstorage:stack_upgrade", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_INTERDIMENSIONAL, new ModelResourceLocation("refinedstorage:interdimensional_upgrade", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.UPGRADE, 0, new ModelResourceLocation("refinedstorage:upgrade", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.UPGRADE, ItemUpgrade.TYPE_RANGE, new ModelResourceLocation("refinedstorage:range_upgrade", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.UPGRADE, ItemUpgrade.TYPE_SPEED, new ModelResourceLocation("refinedstorage:speed_upgrade", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.UPGRADE, ItemUpgrade.TYPE_CRAFTING, new ModelResourceLocation("refinedstorage:crafting_upgrade", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.UPGRADE, ItemUpgrade.TYPE_STACK, new ModelResourceLocation("refinedstorage:stack_upgrade", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.UPGRADE, ItemUpgrade.TYPE_INTERDIMENSIONAL, new ModelResourceLocation("refinedstorage:interdimensional_upgrade", "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", "connected=false,direction=north,type=normal"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.CRAFTING.getId(), new ModelResourceLocation("refinedstorage:grid", "connected=false,direction=north,type=crafting"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.PATTERN.getId(), new ModelResourceLocation("refinedstorage:grid", "connected=false,direction=north,type=pattern"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.FLUID.getId(), new ModelResourceLocation("refinedstorage:grid", "connected=false,direction=north,type=fluid"));
-        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.DISK_DRIVE), 0, new ModelResourceLocation("refinedstorage:disk_drive", "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.DETECTOR), 0, new ModelResourceLocation("refinedstorage:detector", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.RELAY), 0, new ModelResourceLocation("refinedstorage:relay", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.INTERFACE), 0, new ModelResourceLocation("refinedstorage:interface", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.FLUID_INTERFACE), 0, new ModelResourceLocation("refinedstorage:fluid_interface", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER), 0, new ModelResourceLocation("refinedstorage:wireless_transmitter", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_MONITOR), 0, new ModelResourceLocation("refinedstorage:crafting_monitor", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTER), 0, new ModelResourceLocation("refinedstorage:crafter", "connected=false,direction=north"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.PROCESSING_PATTERN_ENCODER), 0, new ModelResourceLocation("refinedstorage:processing_pattern_encoder", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.NETWORK_TRANSMITTER), 0, new ModelResourceLocation("refinedstorage:network_transmitter", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.NETWORK_RECEIVER), 0, new ModelResourceLocation("refinedstorage:network_receiver", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumItemStorageType.TYPE_1K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=1k"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumItemStorageType.TYPE_4K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=4k"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumItemStorageType.TYPE_16K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=16k"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumItemStorageType.TYPE_64K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=64k"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumItemStorageType.TYPE_CREATIVE.getId(), new ModelResourceLocation("refinedstorage:storage", "type=creative"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.FLUID_STORAGE), EnumFluidStorageType.TYPE_64K.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=64k"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.FLUID_STORAGE), EnumFluidStorageType.TYPE_128K.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=128k"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.FLUID_STORAGE), EnumFluidStorageType.TYPE_256K.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=256k"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.FLUID_STORAGE), EnumFluidStorageType.TYPE_512K.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=512k"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.FLUID_STORAGE), EnumFluidStorageType.TYPE_CREATIVE.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=creative"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.DISK_MANIPULATOR), 0, new ModelResourceLocation("refinedstorage:disk_manipulator", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.CABLE), 0, new ModelResourceLocation("refinedstorage:cable", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.GRID), EnumGridType.NORMAL.getId(), new ModelResourceLocation("refinedstorage:grid", "connected=false,direction=north,type=normal"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.GRID), EnumGridType.CRAFTING.getId(), new ModelResourceLocation("refinedstorage:grid", "connected=false,direction=north,type=crafting"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.GRID), EnumGridType.PATTERN.getId(), new ModelResourceLocation("refinedstorage:grid", "connected=false,direction=north,type=pattern"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.GRID), EnumGridType.FLUID.getId(), new ModelResourceLocation("refinedstorage:grid", "connected=false,direction=north,type=fluid"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.MACHINE_CASING), 0, new ModelResourceLocation("refinedstorage:machine_casing", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.EXPORTER), 0, new ModelResourceLocation("refinedstorage:exporter", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.IMPORTER), 0, new ModelResourceLocation("refinedstorage:importer", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.EXTERNAL_STORAGE), 0, new ModelResourceLocation("refinedstorage:external_storage", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.DISK_DRIVE), 0, new ModelResourceLocation("refinedstorage:disk_drive", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.CONSTRUCTOR), 0, new ModelResourceLocation("refinedstorage:constructor", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.DESTRUCTOR), 0, new ModelResourceLocation("refinedstorage:destructor", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.SOLDERER), 0, new ModelResourceLocation("refinedstorage:solderer", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.DETECTOR), 0, new ModelResourceLocation("refinedstorage:detector", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.RELAY), 0, new ModelResourceLocation("refinedstorage:relay", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.INTERFACE), 0, new ModelResourceLocation("refinedstorage:interface", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.FLUID_INTERFACE), 0, new ModelResourceLocation("refinedstorage:fluid_interface", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.WIRELESS_TRANSMITTER), 0, new ModelResourceLocation("refinedstorage:wireless_transmitter", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.CRAFTING_MONITOR), 0, new ModelResourceLocation("refinedstorage:crafting_monitor", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.CRAFTER), 0, new ModelResourceLocation("refinedstorage:crafter", "connected=false,direction=north"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.PROCESSING_PATTERN_ENCODER), 0, new ModelResourceLocation("refinedstorage:processing_pattern_encoder", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.NETWORK_TRANSMITTER), 0, new ModelResourceLocation("refinedstorage:network_transmitter", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.NETWORK_RECEIVER), 0, new ModelResourceLocation("refinedstorage:network_receiver", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.STORAGE), EnumItemStorageType.TYPE_1K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=1k"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.STORAGE), EnumItemStorageType.TYPE_4K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=4k"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.STORAGE), EnumItemStorageType.TYPE_16K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=16k"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.STORAGE), EnumItemStorageType.TYPE_64K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=64k"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.STORAGE), EnumItemStorageType.TYPE_CREATIVE.getId(), new ModelResourceLocation("refinedstorage:storage", "type=creative"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.FLUID_STORAGE), EnumFluidStorageType.TYPE_64K.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=64k"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.FLUID_STORAGE), EnumFluidStorageType.TYPE_128K.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=128k"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.FLUID_STORAGE), EnumFluidStorageType.TYPE_256K.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=256k"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.FLUID_STORAGE), EnumFluidStorageType.TYPE_512K.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=512k"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.FLUID_STORAGE), EnumFluidStorageType.TYPE_CREATIVE.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=creative"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.DISK_MANIPULATOR), 0, new ModelResourceLocation("refinedstorage:disk_manipulator", "inventory"));
 
-        ModelLoader.setCustomStateMapper(RefinedStorageBlocks.CONTROLLER, new StateMap.Builder().ignore(BlockController.TYPE).build());
+        ModelLoader.setCustomStateMapper(RSBlocks.CONTROLLER, new StateMap.Builder().ignore(BlockController.TYPE).build());
 
-        ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(RefinedStorageBlocks.CONTROLLER), stack -> {
+        ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(RSBlocks.CONTROLLER), stack -> {
             int energy = stack.getItemDamage() == EnumControllerType.CREATIVE.getId() ? 7 : TileController.getEnergyScaled(ItemBlockController.getEnergyStored(stack), ItemBlockController.getEnergyCapacity(stack), 7);
 
             return new ModelResourceLocation("refinedstorage:controller", "direction=north,energy=" + energy);

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

@@ -15,10 +15,10 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.oredict.OreDictionary;
 import net.minecraftforge.oredict.ShapedOreRecipe;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageBlocks;
-import refinedstorage.RefinedStorageItems;
-import refinedstorage.api.RefinedStorageAPI;
+import refinedstorage.RS;
+import refinedstorage.RSBlocks;
+import refinedstorage.RSItems;
+import refinedstorage.api.RSAPI;
 import refinedstorage.api.solderer.SoldererRecipe;
 import refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementRoot;
 import refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementToTake;
@@ -48,36 +48,36 @@ public class CommonProxy {
             IntegrationCraftingTweaks.register();
         }
 
-        RefinedStorageAPI.instance().getCraftingTaskRegistry().addFactory(CraftingTaskFactoryNormal.ID, new CraftingTaskFactoryNormal());
+        RSAPI.instance().getCraftingTaskRegistry().addFactory(CraftingTaskFactoryNormal.ID, new CraftingTaskFactoryNormal());
 
-        RefinedStorageAPI.instance().getCraftingMonitorElementRegistry().add(CraftingMonitorElementRoot.ID, buf -> new CraftingMonitorElementRoot(buf.readInt(), ByteBufUtils.readItemStack(buf), buf.readInt()));
-        RefinedStorageAPI.instance().getCraftingMonitorElementRegistry().add(CraftingMonitorElementToTake.ID, buf -> new CraftingMonitorElementToTake(ByteBufUtils.readItemStack(buf), buf.readInt()));
+        RSAPI.instance().getCraftingMonitorElementRegistry().add(CraftingMonitorElementRoot.ID, buf -> new CraftingMonitorElementRoot(buf.readInt(), ByteBufUtils.readItemStack(buf), buf.readInt()));
+        RSAPI.instance().getCraftingMonitorElementRegistry().add(CraftingMonitorElementToTake.ID, buf -> new CraftingMonitorElementToTake(ByteBufUtils.readItemStack(buf), buf.readInt()));
 
         int id = 0;
 
-        RefinedStorage.INSTANCE.network.registerMessage(MessageTileDataParameter.class, MessageTileDataParameter.class, id++, Side.CLIENT);
-        RefinedStorage.INSTANCE.network.registerMessage(MessageTileDataParameterUpdate.class, MessageTileDataParameterUpdate.class, id++, Side.SERVER);
-        RefinedStorage.INSTANCE.network.registerMessage(MessageGridItemInsertHeld.class, MessageGridItemInsertHeld.class, id++, Side.SERVER);
-        RefinedStorage.INSTANCE.network.registerMessage(MessageGridItemPull.class, MessageGridItemPull.class, id++, Side.SERVER);
-        RefinedStorage.INSTANCE.network.registerMessage(MessageGridCraftingClear.class, MessageGridCraftingClear.class, id++, Side.SERVER);
-        RefinedStorage.INSTANCE.network.registerMessage(MessageGridCraftingTransfer.class, MessageGridCraftingTransfer.class, id++, Side.SERVER);
-        RefinedStorage.INSTANCE.network.registerMessage(MessageWirelessGridSettingsUpdate.class, MessageWirelessGridSettingsUpdate.class, id++, Side.SERVER);
-        RefinedStorage.INSTANCE.network.registerMessage(MessageGridCraftingStart.class, MessageGridCraftingStart.class, id++, Side.SERVER);
-        RefinedStorage.INSTANCE.network.registerMessage(MessageGridPatternCreate.class, MessageGridPatternCreate.class, id++, Side.SERVER);
-        RefinedStorage.INSTANCE.network.registerMessage(MessageCraftingMonitorCancel.class, MessageCraftingMonitorCancel.class, id++, Side.SERVER);
-        RefinedStorage.INSTANCE.network.registerMessage(MessageGridItemUpdate.class, MessageGridItemUpdate.class, id++, Side.CLIENT);
-        RefinedStorage.INSTANCE.network.registerMessage(MessageGridItemDelta.class, MessageGridItemDelta.class, id++, Side.CLIENT);
-        RefinedStorage.INSTANCE.network.registerMessage(MessageGridFluidUpdate.class, MessageGridFluidUpdate.class, id++, Side.CLIENT);
-        RefinedStorage.INSTANCE.network.registerMessage(MessageGridFluidDelta.class, MessageGridFluidDelta.class, id++, Side.CLIENT);
-        RefinedStorage.INSTANCE.network.registerMessage(MessageGridFluidPull.class, MessageGridFluidPull.class, id++, Side.SERVER);
-        RefinedStorage.INSTANCE.network.registerMessage(MessageGridFluidInsertHeld.class, MessageGridFluidInsertHeld.class, id++, Side.SERVER);
-        RefinedStorage.INSTANCE.network.registerMessage(MessageProcessingPatternEncoderClear.class, MessageProcessingPatternEncoderClear.class, id++, Side.SERVER);
-        RefinedStorage.INSTANCE.network.registerMessage(MessageGridFilterUpdate.class, MessageGridFilterUpdate.class, id++, Side.SERVER);
-        RefinedStorage.INSTANCE.network.registerMessage(MessageGridCraftingPreview.class, MessageGridCraftingPreview.class, id++, Side.SERVER);
+        RS.INSTANCE.network.registerMessage(MessageTileDataParameter.class, MessageTileDataParameter.class, id++, Side.CLIENT);
+        RS.INSTANCE.network.registerMessage(MessageTileDataParameterUpdate.class, MessageTileDataParameterUpdate.class, id++, Side.SERVER);
+        RS.INSTANCE.network.registerMessage(MessageGridItemInsertHeld.class, MessageGridItemInsertHeld.class, id++, Side.SERVER);
+        RS.INSTANCE.network.registerMessage(MessageGridItemPull.class, MessageGridItemPull.class, id++, Side.SERVER);
+        RS.INSTANCE.network.registerMessage(MessageGridCraftingClear.class, MessageGridCraftingClear.class, id++, Side.SERVER);
+        RS.INSTANCE.network.registerMessage(MessageGridCraftingTransfer.class, MessageGridCraftingTransfer.class, id++, Side.SERVER);
+        RS.INSTANCE.network.registerMessage(MessageWirelessGridSettingsUpdate.class, MessageWirelessGridSettingsUpdate.class, id++, Side.SERVER);
+        RS.INSTANCE.network.registerMessage(MessageGridCraftingStart.class, MessageGridCraftingStart.class, id++, Side.SERVER);
+        RS.INSTANCE.network.registerMessage(MessageGridPatternCreate.class, MessageGridPatternCreate.class, id++, Side.SERVER);
+        RS.INSTANCE.network.registerMessage(MessageCraftingMonitorCancel.class, MessageCraftingMonitorCancel.class, id++, Side.SERVER);
+        RS.INSTANCE.network.registerMessage(MessageGridItemUpdate.class, MessageGridItemUpdate.class, id++, Side.CLIENT);
+        RS.INSTANCE.network.registerMessage(MessageGridItemDelta.class, MessageGridItemDelta.class, id++, Side.CLIENT);
+        RS.INSTANCE.network.registerMessage(MessageGridFluidUpdate.class, MessageGridFluidUpdate.class, id++, Side.CLIENT);
+        RS.INSTANCE.network.registerMessage(MessageGridFluidDelta.class, MessageGridFluidDelta.class, id++, Side.CLIENT);
+        RS.INSTANCE.network.registerMessage(MessageGridFluidPull.class, MessageGridFluidPull.class, id++, Side.SERVER);
+        RS.INSTANCE.network.registerMessage(MessageGridFluidInsertHeld.class, MessageGridFluidInsertHeld.class, id++, Side.SERVER);
+        RS.INSTANCE.network.registerMessage(MessageProcessingPatternEncoderClear.class, MessageProcessingPatternEncoderClear.class, id++, Side.SERVER);
+        RS.INSTANCE.network.registerMessage(MessageGridFilterUpdate.class, MessageGridFilterUpdate.class, id++, Side.SERVER);
+        RS.INSTANCE.network.registerMessage(MessageGridCraftingPreview.class, MessageGridCraftingPreview.class, id++, Side.SERVER);
         //RefinedStorage.INSTANCE.network.registerMessage(MessageGridCraftingPreviewResponse.class, MessageGridCraftingPreviewResponse.class, id++, Side.CLIENT);
-        RefinedStorage.INSTANCE.network.registerMessage(MessageProcessingPatternEncoderTransfer.class, MessageProcessingPatternEncoderTransfer.class, id++, Side.SERVER);
+        RS.INSTANCE.network.registerMessage(MessageProcessingPatternEncoderTransfer.class, MessageProcessingPatternEncoderTransfer.class, id++, Side.SERVER);
 
-        NetworkRegistry.INSTANCE.registerGuiHandler(RefinedStorage.INSTANCE, new GuiHandler());
+        NetworkRegistry.INSTANCE.registerGuiHandler(RS.INSTANCE, new GuiHandler());
 
         MinecraftForge.EVENT_BUS.register(new ContainerListener());
 
@@ -105,63 +105,63 @@ public class CommonProxy {
         registerTile(TileFluidStorage.class, "fluid_storage");
         registerTile(TileDiskManipulator.class, "disk_manipulator");
 
-        registerBlock(RefinedStorageBlocks.CONTROLLER);
-        registerBlock(RefinedStorageBlocks.GRID);
-        registerBlock(RefinedStorageBlocks.CRAFTING_MONITOR);
-        registerBlock(RefinedStorageBlocks.CRAFTER);
-        registerBlock(RefinedStorageBlocks.PROCESSING_PATTERN_ENCODER);
-        registerBlock(RefinedStorageBlocks.DISK_DRIVE);
-        registerBlock(RefinedStorageBlocks.STORAGE);
-        registerBlock(RefinedStorageBlocks.FLUID_STORAGE);
-        registerBlock(RefinedStorageBlocks.SOLDERER);
-        registerBlock(RefinedStorageBlocks.CABLE);
-        registerBlock(RefinedStorageBlocks.IMPORTER);
-        registerBlock(RefinedStorageBlocks.EXPORTER);
-        registerBlock(RefinedStorageBlocks.EXTERNAL_STORAGE);
-        registerBlock(RefinedStorageBlocks.CONSTRUCTOR);
-        registerBlock(RefinedStorageBlocks.DESTRUCTOR);
-        registerBlock(RefinedStorageBlocks.DETECTOR);
-        registerBlock(RefinedStorageBlocks.RELAY);
-        registerBlock(RefinedStorageBlocks.INTERFACE);
-        registerBlock(RefinedStorageBlocks.FLUID_INTERFACE);
-        registerBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER);
-        registerBlock(RefinedStorageBlocks.MACHINE_CASING);
-        registerBlock(RefinedStorageBlocks.NETWORK_TRANSMITTER);
-        registerBlock(RefinedStorageBlocks.NETWORK_RECEIVER);
-        registerBlock(RefinedStorageBlocks.DISK_MANIPULATOR);
+        registerBlock(RSBlocks.CONTROLLER);
+        registerBlock(RSBlocks.GRID);
+        registerBlock(RSBlocks.CRAFTING_MONITOR);
+        registerBlock(RSBlocks.CRAFTER);
+        registerBlock(RSBlocks.PROCESSING_PATTERN_ENCODER);
+        registerBlock(RSBlocks.DISK_DRIVE);
+        registerBlock(RSBlocks.STORAGE);
+        registerBlock(RSBlocks.FLUID_STORAGE);
+        registerBlock(RSBlocks.SOLDERER);
+        registerBlock(RSBlocks.CABLE);
+        registerBlock(RSBlocks.IMPORTER);
+        registerBlock(RSBlocks.EXPORTER);
+        registerBlock(RSBlocks.EXTERNAL_STORAGE);
+        registerBlock(RSBlocks.CONSTRUCTOR);
+        registerBlock(RSBlocks.DESTRUCTOR);
+        registerBlock(RSBlocks.DETECTOR);
+        registerBlock(RSBlocks.RELAY);
+        registerBlock(RSBlocks.INTERFACE);
+        registerBlock(RSBlocks.FLUID_INTERFACE);
+        registerBlock(RSBlocks.WIRELESS_TRANSMITTER);
+        registerBlock(RSBlocks.MACHINE_CASING);
+        registerBlock(RSBlocks.NETWORK_TRANSMITTER);
+        registerBlock(RSBlocks.NETWORK_RECEIVER);
+        registerBlock(RSBlocks.DISK_MANIPULATOR);
 
-        registerItem(RefinedStorageItems.QUARTZ_ENRICHED_IRON);
-        registerItem(RefinedStorageItems.STORAGE_DISK);
-        registerItem(RefinedStorageItems.FLUID_STORAGE_DISK);
-        registerItem(RefinedStorageItems.STORAGE_HOUSING);
-        registerItem(RefinedStorageItems.PATTERN);
-        registerItem(RefinedStorageItems.STORAGE_PART);
-        registerItem(RefinedStorageItems.FLUID_STORAGE_PART);
-        registerItem(RefinedStorageItems.WIRELESS_GRID);
-        registerItem(RefinedStorageItems.PROCESSOR);
-        registerItem(RefinedStorageItems.CORE);
-        registerItem(RefinedStorageItems.SILICON);
-        registerItem(RefinedStorageItems.UPGRADE);
-        registerItem(RefinedStorageItems.GRID_FILTER);
-        registerItem(RefinedStorageItems.NETWORK_CARD);
+        registerItem(RSItems.QUARTZ_ENRICHED_IRON);
+        registerItem(RSItems.STORAGE_DISK);
+        registerItem(RSItems.FLUID_STORAGE_DISK);
+        registerItem(RSItems.STORAGE_HOUSING);
+        registerItem(RSItems.PATTERN);
+        registerItem(RSItems.STORAGE_PART);
+        registerItem(RSItems.FLUID_STORAGE_PART);
+        registerItem(RSItems.WIRELESS_GRID);
+        registerItem(RSItems.PROCESSOR);
+        registerItem(RSItems.CORE);
+        registerItem(RSItems.SILICON);
+        registerItem(RSItems.UPGRADE);
+        registerItem(RSItems.GRID_FILTER);
+        registerItem(RSItems.NETWORK_CARD);
 
-        OreDictionary.registerOre("itemSilicon", RefinedStorageItems.SILICON);
+        OreDictionary.registerOre("itemSilicon", RSItems.SILICON);
 
         // Processors
-        RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_BASIC));
-        RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_IMPROVED));
-        RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_ADVANCED));
-        RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_SILICON));
+        RSAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_BASIC));
+        RSAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_IMPROVED));
+        RSAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_ADVANCED));
+        RSAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_SILICON));
 
-        RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_BASIC));
-        RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_IMPROVED));
-        RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_ADVANCED));
+        RSAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_BASIC));
+        RSAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_IMPROVED));
+        RSAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_ADVANCED));
 
         // Silicon
-        GameRegistry.addSmelting(Items.QUARTZ, new ItemStack(RefinedStorageItems.SILICON), 0.5f);
+        GameRegistry.addSmelting(Items.QUARTZ, new ItemStack(RSItems.SILICON), 0.5f);
 
         // Quartz Enriched Iron
-        GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON, 4),
+        GameRegistry.addRecipe(new ItemStack(RSItems.QUARTZ_ENRICHED_IRON, 4),
                 "II",
                 "IQ",
                 'I', new ItemStack(Items.IRON_INGOT),
@@ -169,313 +169,313 @@ public class CommonProxy {
         );
 
         // Machine Casing
-        GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.MACHINE_CASING),
+        GameRegistry.addRecipe(new ItemStack(RSBlocks.MACHINE_CASING),
                 "EEE",
                 "E E",
                 "EEE",
-                'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON)
+                'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON)
         );
 
         // Construction Core
-        GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
-                new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
+        GameRegistry.addShapelessRecipe(new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
+                new ItemStack(RSItems.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.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
+        GameRegistry.addShapelessRecipe(new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
+                new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
                 new ItemStack(Items.QUARTZ)
         );
 
         // Relay
-        GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.RELAY),
-                new ItemStack(RefinedStorageBlocks.MACHINE_CASING),
-                new ItemStack(RefinedStorageBlocks.CABLE),
+        GameRegistry.addShapelessRecipe(new ItemStack(RSBlocks.RELAY),
+                new ItemStack(RSBlocks.MACHINE_CASING),
+                new ItemStack(RSBlocks.CABLE),
                 new ItemStack(Blocks.REDSTONE_TORCH)
         );
 
         // Controller
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RefinedStorageBlocks.CONTROLLER, 1, EnumControllerType.NORMAL.getId()),
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSBlocks.CONTROLLER, 1, EnumControllerType.NORMAL.getId()),
                 "EDE",
                 "SMS",
                 "ESE",
                 'D', new ItemStack(Items.DIAMOND),
-                'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
-                'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING),
+                'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
+                'M', new ItemStack(RSBlocks.MACHINE_CASING),
                 'S', "itemSilicon"
         ));
 
         // Solderer
-        GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.SOLDERER),
+        GameRegistry.addRecipe(new ItemStack(RSBlocks.SOLDERER),
                 "ESE",
                 "E E",
                 "ESE",
-                'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+                'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
                 'S', new ItemStack(Blocks.STICKY_PISTON)
         );
 
         // Disk Drive
-        RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipe(
-                new ItemStack(RefinedStorageBlocks.DISK_DRIVE),
+        RSAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipe(
+                new ItemStack(RSBlocks.DISK_DRIVE),
                 500,
-                new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
-                new ItemStack(RefinedStorageBlocks.MACHINE_CASING),
+                new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
+                new ItemStack(RSBlocks.MACHINE_CASING),
                 new ItemStack(Blocks.CHEST)
         ));
 
         // Cable
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RefinedStorageBlocks.CABLE, 12),
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSBlocks.CABLE, 12),
                 "EEE",
                 "GRG",
                 "EEE",
-                'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+                'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
                 'G', "blockGlass",
                 'R', new ItemStack(Items.REDSTONE)
         ));
 
         // Wireless Transmitter
-        GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.WIRELESS_TRANSMITTER),
+        GameRegistry.addRecipe(new ItemStack(RSBlocks.WIRELESS_TRANSMITTER),
                 "EPE",
                 "EME",
                 "EAE",
-                'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
-                'A', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
+                'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
+                'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
                 'P', new ItemStack(Items.ENDER_PEARL),
-                'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING)
+                'M', new ItemStack(RSBlocks.MACHINE_CASING)
         );
 
         // Grid
-        GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.NORMAL.getId()),
+        GameRegistry.addRecipe(new ItemStack(RSBlocks.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)
+                'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
+                'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED),
+                'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
+                'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
+                'M', new ItemStack(RSBlocks.MACHINE_CASING)
         );
 
         // Crafting Grid
-        RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipe(
-                new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.CRAFTING.getId()),
+        RSAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipe(
+                new ItemStack(RSBlocks.GRID, 1, EnumGridType.CRAFTING.getId()),
                 500,
-                new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
-                new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.NORMAL.getId()),
+                new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
+                new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId()),
                 new ItemStack(Blocks.CRAFTING_TABLE)
         ));
 
         // Pattern Grid
-        RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipe(
-                new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.PATTERN.getId()),
+        RSAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipe(
+                new ItemStack(RSBlocks.GRID, 1, EnumGridType.PATTERN.getId()),
                 500,
-                new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
-                new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.NORMAL.getId()),
-                new ItemStack(RefinedStorageItems.PATTERN)
+                new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
+                new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId()),
+                new ItemStack(RSItems.PATTERN)
         ));
 
         // Fluid Grid
-        RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipe(
-                new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.FLUID.getId()),
+        RSAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipe(
+                new ItemStack(RSBlocks.GRID, 1, EnumGridType.FLUID.getId()),
                 500,
-                new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
-                new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.NORMAL.getId()),
+                new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
+                new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId()),
                 new ItemStack(Items.BUCKET)
         ));
 
         // Wireless Grid
-        GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.WIRELESS_GRID, 1, ItemWirelessGrid.TYPE_NORMAL),
+        GameRegistry.addRecipe(new ItemStack(RSItems.WIRELESS_GRID, 1, ItemWirelessGrid.TYPE_NORMAL),
                 "EPE",
                 "EAE",
                 "EEE",
                 'P', new ItemStack(Items.ENDER_PEARL),
-                'A', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
-                'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON)
+                'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
+                'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON)
         );
 
         // Crafter
-        GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.CRAFTER),
+        GameRegistry.addRecipe(new ItemStack(RSBlocks.CRAFTER),
                 "ECE",
                 "AMA",
                 "EDE",
-                'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
-                'A', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
-                'C', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
-                'D', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
-                'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING)
+                'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
+                'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
+                'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
+                'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
+                'M', new ItemStack(RSBlocks.MACHINE_CASING)
         );
 
         // Processing Pattern Encoder
-        GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.PROCESSING_PATTERN_ENCODER),
+        GameRegistry.addRecipe(new ItemStack(RSBlocks.PROCESSING_PATTERN_ENCODER),
                 "ECE",
                 "PMP",
                 "EFE",
-                'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
-                'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING),
-                'P', new ItemStack(RefinedStorageItems.PATTERN),
+                'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
+                'M', new ItemStack(RSBlocks.MACHINE_CASING),
+                'P', new ItemStack(RSItems.PATTERN),
                 'C', new ItemStack(Blocks.CRAFTING_TABLE),
                 'F', new ItemStack(Blocks.FURNACE)
         );
 
         // External Storage
-        GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.EXTERNAL_STORAGE),
+        GameRegistry.addRecipe(new ItemStack(RSBlocks.EXTERNAL_STORAGE),
                 "CED",
                 "HMH",
                 "EPE",
-                'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+                'E', new ItemStack(RSItems.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.CABLE),
-                'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
+                'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
+                'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
+                'M', new ItemStack(RSBlocks.CABLE),
+                'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
         );
 
         // Importer
-        GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.IMPORTER),
-                new ItemStack(RefinedStorageBlocks.CABLE),
-                new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
-                new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
+        GameRegistry.addShapelessRecipe(new ItemStack(RSBlocks.IMPORTER),
+                new ItemStack(RSBlocks.CABLE),
+                new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
+                new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
         );
 
         // Exporter
-        GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.EXPORTER),
-                new ItemStack(RefinedStorageBlocks.CABLE),
-                new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
-                new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
+        GameRegistry.addShapelessRecipe(new ItemStack(RSBlocks.EXPORTER),
+                new ItemStack(RSBlocks.CABLE),
+                new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
+                new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
         );
 
         // Destructor
-        GameRegistry.addShapedRecipe(new ItemStack(RefinedStorageBlocks.DESTRUCTOR),
+        GameRegistry.addShapedRecipe(new ItemStack(RSBlocks.DESTRUCTOR),
                 "EDE",
                 "RMR",
                 "EIE",
-                'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
-                'D', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
+                'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
+                'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
                 'R', new ItemStack(Items.REDSTONE),
-                'M', new ItemStack(RefinedStorageBlocks.CABLE),
-                'I', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
+                'M', new ItemStack(RSBlocks.CABLE),
+                'I', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
         );
 
         // Constructor
-        GameRegistry.addShapedRecipe(new ItemStack(RefinedStorageBlocks.CONSTRUCTOR),
+        GameRegistry.addShapedRecipe(new ItemStack(RSBlocks.CONSTRUCTOR),
                 "ECE",
                 "RMR",
                 "EIE",
-                'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
-                'C', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
+                'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
+                'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
                 'R', new ItemStack(Items.REDSTONE),
-                'M', new ItemStack(RefinedStorageBlocks.CABLE),
-                'I', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
+                'M', new ItemStack(RSBlocks.CABLE),
+                'I', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
         );
 
         // Detector
-        GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.DETECTOR),
+        GameRegistry.addRecipe(new ItemStack(RSBlocks.DETECTOR),
                 "ECE",
                 "RMR",
                 "EPE",
-                'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+                'E', new ItemStack(RSItems.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)
+                'M', new ItemStack(RSBlocks.MACHINE_CASING),
+                'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
         );
 
         // Storage Parts
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K),
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K),
                 "SES",
                 "GRG",
                 "SGS",
                 'R', new ItemStack(Items.REDSTONE),
-                'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+                'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
                 'S', "itemSilicon",
                 'G', "blockGlass"
         ));
 
-        GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K),
+        GameRegistry.addRecipe(new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K),
                 "PEP",
                 "SRS",
                 "PSP",
                 '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)
+                'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
+                'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
+                'S', new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K)
         );
 
-        GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K),
+        GameRegistry.addRecipe(new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K),
                 "PEP",
                 "SRS",
                 "PSP",
                 '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)
+                'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
+                'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED),
+                'S', new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K)
         );
 
-        GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_64K),
+        GameRegistry.addRecipe(new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_64K),
                 "PEP",
                 "SRS",
                 "PSP",
                 '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)
+                'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
+                'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
+                'S', new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K)
         );
 
         // Fluid Storage Parts
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RefinedStorageItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_64K),
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_64K),
                 "SES",
                 "GRG",
                 "SGS",
                 'R', new ItemStack(Items.BUCKET),
-                'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+                'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
                 'S', "itemSilicon",
                 'G', "blockGlass"
         ));
 
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RefinedStorageItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_128K),
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_128K),
                 "PEP",
                 "SRS",
                 "PSP",
                 'R', new ItemStack(Items.BUCKET),
-                'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
-                'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
-                'S', new ItemStack(RefinedStorageItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_64K)
+                'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
+                'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
+                'S', new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_64K)
         ));
 
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RefinedStorageItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_256K),
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_256K),
                 "PEP",
                 "SRS",
                 "PSP",
                 'R', new ItemStack(Items.BUCKET),
-                'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
-                'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED),
-                'S', new ItemStack(RefinedStorageItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_128K)
+                'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
+                'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED),
+                'S', new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_128K)
         ));
 
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RefinedStorageItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_512K),
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_512K),
                 "PEP",
                 "SRS",
                 "PSP",
                 'R', new ItemStack(Items.BUCKET),
-                'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
-                'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
-                'S', new ItemStack(RefinedStorageItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_256K)
+                'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
+                'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
+                'S', new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_256K)
         ));
 
         // Storage Housing
-        GameRegistry.addRecipe(new ShapedOreRecipe(ItemStorageNBT.createStackWithNBT(new ItemStack(RefinedStorageItems.STORAGE_HOUSING)),
+        GameRegistry.addRecipe(new ShapedOreRecipe(ItemStorageNBT.createStackWithNBT(new ItemStack(RSItems.STORAGE_HOUSING)),
                 "GRG",
                 "R R",
                 "EEE",
                 'G', "blockGlass",
                 'R', new ItemStack(Items.REDSTONE),
-                'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON)
+                'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON)
         ));
 
         // Storage Disks
         for (int type = 0; type <= 3; ++type) {
-            ItemStack disk = ItemStorageNBT.createStackWithNBT(new ItemStack(RefinedStorageItems.STORAGE_DISK, 1, type));
+            ItemStack disk = ItemStorageNBT.createStackWithNBT(new ItemStack(RSItems.STORAGE_DISK, 1, type));
 
             GameRegistry.addRecipe(new ShapedOreRecipe(disk,
                     "GRG",
@@ -483,19 +483,19 @@ public class CommonProxy {
                     "EEE",
                     'G', "blockGlass",
                     'R', new ItemStack(Items.REDSTONE),
-                    'P', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, type),
-                    'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON)
+                    'P', new ItemStack(RSItems.STORAGE_PART, 1, type),
+                    'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON)
             ));
 
             GameRegistry.addShapelessRecipe(disk,
-                    new ItemStack(RefinedStorageItems.STORAGE_HOUSING),
-                    new ItemStack(RefinedStorageItems.STORAGE_PART, 1, type)
+                    new ItemStack(RSItems.STORAGE_HOUSING),
+                    new ItemStack(RSItems.STORAGE_PART, 1, type)
             );
         }
 
         // Fluid Storage Disks
         for (int type = 0; type <= 3; ++type) {
-            ItemStack disk = FluidStorageNBT.createStackWithNBT(new ItemStack(RefinedStorageItems.FLUID_STORAGE_DISK, 1, type));
+            ItemStack disk = FluidStorageNBT.createStackWithNBT(new ItemStack(RSItems.FLUID_STORAGE_DISK, 1, type));
 
             GameRegistry.addRecipe(new ShapedOreRecipe(disk,
                     "GRG",
@@ -503,144 +503,144 @@ public class CommonProxy {
                     "EEE",
                     'G', "blockGlass",
                     'R', new ItemStack(Items.REDSTONE),
-                    'P', new ItemStack(RefinedStorageItems.FLUID_STORAGE_PART, 1, type),
-                    'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON)
+                    'P', new ItemStack(RSItems.FLUID_STORAGE_PART, 1, type),
+                    'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON)
             ));
 
             GameRegistry.addShapelessRecipe(disk,
-                    new ItemStack(RefinedStorageItems.STORAGE_HOUSING),
-                    new ItemStack(RefinedStorageItems.FLUID_STORAGE_PART, 1, type)
+                    new ItemStack(RSItems.STORAGE_HOUSING),
+                    new ItemStack(RSItems.FLUID_STORAGE_PART, 1, type)
             );
         }
 
         // Pattern
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RefinedStorageItems.PATTERN),
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.PATTERN),
                 "GRG",
                 "RGR",
                 "EEE",
                 'G', "blockGlass",
                 'R', new ItemStack(Items.REDSTONE),
-                'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON)
+                'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON)
         ));
 
         // Upgrade
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RefinedStorageItems.UPGRADE, 1, 0),
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.UPGRADE, 1, 0),
                 "EGE",
                 "EPE",
                 "EGE",
                 'G', "blockGlass",
-                'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED),
-                'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON)
+                'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED),
+                'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON)
         ));
 
-        RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_RANGE));
-        RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_SPEED));
-        RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_INTERDIMENSIONAL));
-        RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_CRAFTING));
+        RSAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_RANGE));
+        RSAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_SPEED));
+        RSAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_INTERDIMENSIONAL));
+        RSAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_CRAFTING));
 
-        GameRegistry.addShapedRecipe(new ItemStack(RefinedStorageItems.UPGRADE, 1, ItemUpgrade.TYPE_STACK),
+        GameRegistry.addShapedRecipe(new ItemStack(RSItems.UPGRADE, 1, ItemUpgrade.TYPE_STACK),
                 "USU",
                 "SUS",
                 "USU",
                 'U', new ItemStack(Items.SUGAR),
-                'S', new ItemStack(RefinedStorageItems.UPGRADE, 1, ItemUpgrade.TYPE_SPEED)
+                'S', new ItemStack(RSItems.UPGRADE, 1, ItemUpgrade.TYPE_SPEED)
         );
 
         // Storage Blocks
-        RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeStorage(EnumItemStorageType.TYPE_1K, ItemStoragePart.TYPE_1K));
-        RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeStorage(EnumItemStorageType.TYPE_4K, ItemStoragePart.TYPE_4K));
-        RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeStorage(EnumItemStorageType.TYPE_16K, ItemStoragePart.TYPE_16K));
-        RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeStorage(EnumItemStorageType.TYPE_64K, ItemStoragePart.TYPE_64K));
+        RSAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeStorage(EnumItemStorageType.TYPE_1K, ItemStoragePart.TYPE_1K));
+        RSAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeStorage(EnumItemStorageType.TYPE_4K, ItemStoragePart.TYPE_4K));
+        RSAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeStorage(EnumItemStorageType.TYPE_16K, ItemStoragePart.TYPE_16K));
+        RSAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeStorage(EnumItemStorageType.TYPE_64K, ItemStoragePart.TYPE_64K));
 
         // Fluid Storage Blocks
-        RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeFluidStorage(EnumFluidStorageType.TYPE_64K, ItemFluidStoragePart.TYPE_64K));
-        RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeFluidStorage(EnumFluidStorageType.TYPE_128K, ItemFluidStoragePart.TYPE_128K));
-        RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeFluidStorage(EnumFluidStorageType.TYPE_256K, ItemFluidStoragePart.TYPE_256K));
-        RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeFluidStorage(EnumFluidStorageType.TYPE_512K, ItemFluidStoragePart.TYPE_512K));
+        RSAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeFluidStorage(EnumFluidStorageType.TYPE_64K, ItemFluidStoragePart.TYPE_64K));
+        RSAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeFluidStorage(EnumFluidStorageType.TYPE_128K, ItemFluidStoragePart.TYPE_128K));
+        RSAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeFluidStorage(EnumFluidStorageType.TYPE_256K, ItemFluidStoragePart.TYPE_256K));
+        RSAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipeFluidStorage(EnumFluidStorageType.TYPE_512K, ItemFluidStoragePart.TYPE_512K));
 
         // Crafting Monitor
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RefinedStorageBlocks.CRAFTING_MONITOR),
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSBlocks.CRAFTING_MONITOR),
                 "EGE",
                 "GMG",
                 "EPE",
-                'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
-                'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING),
+                'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
+                'M', new ItemStack(RSBlocks.MACHINE_CASING),
                 'G', "blockGlass",
-                'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
+                'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
         ));
 
         // Interface
-        RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipe(
-                new ItemStack(RefinedStorageBlocks.INTERFACE),
+        RSAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipe(
+                new ItemStack(RSBlocks.INTERFACE),
                 200,
-                new ItemStack(RefinedStorageBlocks.IMPORTER),
-                new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
-                new ItemStack(RefinedStorageBlocks.EXPORTER)
+                new ItemStack(RSBlocks.IMPORTER),
+                new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
+                new ItemStack(RSBlocks.EXPORTER)
         ));
 
         // Fluid Interface
-        RefinedStorageAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipe(
-                new ItemStack(RefinedStorageBlocks.FLUID_INTERFACE),
+        RSAPI.instance().getSoldererRegistry().addRecipe(new SoldererRecipe(
+                new ItemStack(RSBlocks.FLUID_INTERFACE),
                 200,
                 new ItemStack(Items.BUCKET),
-                new ItemStack(RefinedStorageBlocks.INTERFACE),
+                new ItemStack(RSBlocks.INTERFACE),
                 new ItemStack(Items.BUCKET)
         ));
 
         // Grid Filter
-        GameRegistry.addShapedRecipe(new ItemStack(RefinedStorageItems.GRID_FILTER),
+        GameRegistry.addShapedRecipe(new ItemStack(RSItems.GRID_FILTER),
                 "EPE",
                 "PHP",
                 "EPE",
-                'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+                'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
                 'P', new ItemStack(Items.PAPER),
                 'H', new ItemStack(Blocks.HOPPER)
         );
 
         // Network Card
-        GameRegistry.addShapedRecipe(new ItemStack(RefinedStorageItems.NETWORK_CARD),
+        GameRegistry.addShapedRecipe(new ItemStack(RSItems.NETWORK_CARD),
                 "EEE",
                 "PAP",
                 "EEE",
-                'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+                'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
                 'P', new ItemStack(Items.PAPER),
-                'A', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
+                'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
         );
 
         // Network Transmitter
-        GameRegistry.addShapedRecipe(new ItemStack(RefinedStorageBlocks.NETWORK_TRANSMITTER),
+        GameRegistry.addShapedRecipe(new ItemStack(RSBlocks.NETWORK_TRANSMITTER),
                 "EEE",
                 "CMD",
                 "AAA",
                 'E', new ItemStack(Items.ENDER_PEARL),
-                'C', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
-                'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING),
-                'D', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
-                'A', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
+                'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
+                'M', new ItemStack(RSBlocks.MACHINE_CASING),
+                'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
+                'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
         );
 
         // Network Receiver
-        GameRegistry.addShapedRecipe(new ItemStack(RefinedStorageBlocks.NETWORK_RECEIVER),
+        GameRegistry.addShapedRecipe(new ItemStack(RSBlocks.NETWORK_RECEIVER),
                 "AAA",
                 "CMD",
                 "EEE",
                 'E', new ItemStack(Items.ENDER_PEARL),
-                'C', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
-                'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING),
-                'D', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
-                'A', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
+                'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
+                'M', new ItemStack(RSBlocks.MACHINE_CASING),
+                'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
+                'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
         );
 
         // Disk Manipulator
-        GameRegistry.addShapedRecipe(new ItemStack(RefinedStorageBlocks.DISK_MANIPULATOR),
+        GameRegistry.addShapedRecipe(new ItemStack(RSBlocks.DISK_MANIPULATOR),
                 "ESE",
                 "CMD",
                 "ESE",
-                'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
-                'S', new ItemStack(RefinedStorageItems.STORAGE_HOUSING),
-                'C', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
-                'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING),
-                'D', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION)
+                'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
+                'S', new ItemStack(RSItems.STORAGE_HOUSING),
+                'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
+                'M', new ItemStack(RSBlocks.MACHINE_CASING),
+                'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION)
         );
     }
 
@@ -665,7 +665,7 @@ public class CommonProxy {
     }
 
     private void registerTile(Class<? extends TileBase> tile, String id) {
-        GameRegistry.registerTileEntity(tile, RefinedStorage.ID + ":" + id);
+        GameRegistry.registerTileEntity(tile, RS.ID + ":" + id);
 
         try {
             TileBase tileInstance = tile.newInstance();

src/main/java/refinedstorage/tile/TileCable.java

@@ -1,11 +1,11 @@
 package refinedstorage.tile;
 
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 
 public class TileCable extends TileMultipartNode {
     @Override
     public int getEnergyUsage() {
-        return RefinedStorage.INSTANCE.config.cableUsage;
+        return RS.INSTANCE.config.cableUsage;
     }
 
     @Override

src/main/java/refinedstorage/tile/TileConstructor.java

@@ -15,7 +15,7 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.api.network.NetworkUtils;
 import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.container.slot.SlotSpecimen;
@@ -66,7 +66,7 @@ public class TileConstructor extends TileMultipartNode implements IComparable, I
 
     @Override
     public int getEnergyUsage() {
-        return RefinedStorage.INSTANCE.config.constructorUsage + upgrades.getEnergyUsage();
+        return RS.INSTANCE.config.constructorUsage + upgrades.getEnergyUsage();
     }
 
     @Override

src/main/java/refinedstorage/tile/TileController.java

@@ -18,8 +18,8 @@ import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.energy.CapabilityEnergy;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.items.ItemHandlerHelper;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageBlocks;
+import refinedstorage.RS;
+import refinedstorage.RSBlocks;
 import refinedstorage.api.autocrafting.ICraftingPattern;
 import refinedstorage.api.autocrafting.ICraftingPatternContainer;
 import refinedstorage.api.autocrafting.task.ICraftingTask;
@@ -180,7 +180,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
     private List<ICraftingTask> craftingTasksToCancel = new ArrayList<>();
     private List<NBTTagCompound> craftingTasksToRead = new ArrayList<>();
 
-    private EnergyStorage energy = new EnergyStorage(RefinedStorage.INSTANCE.config.controllerCapacity);
+    private EnergyStorage energy = new EnergyStorage(RS.INSTANCE.config.controllerCapacity);
     private ControllerEnergyForge energyForge = new ControllerEnergyForge(this);
     private IControllerEnergyIC2 energyEU;
     private ControllerEnergyTesla energyTesla;
@@ -294,7 +294,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
             wirelessGridHandler.update();
 
             if (getType() == EnumControllerType.NORMAL) {
-                if (!RefinedStorage.INSTANCE.config.controllerUsesEnergy) {
+                if (!RS.INSTANCE.config.controllerUsesEnergy) {
                     energy.setEnergyStored(energy.getMaxEnergyStored());
                 } else if (energy.getEnergyStored() - getEnergyUsage() >= 0) {
                     energy.extractEnergy(getEnergyUsage(), false);
@@ -463,14 +463,14 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
 
     @Override
     public void sendItemStorageToClient(EntityPlayerMP player) {
-        RefinedStorage.INSTANCE.network.sendTo(new MessageGridItemUpdate(this), player);
+        RS.INSTANCE.network.sendTo(new MessageGridItemUpdate(this), player);
     }
 
     @Override
     public void sendItemStorageDeltaToClient(ItemStack stack, int delta) {
         worldObj.getMinecraftServer().getPlayerList().getPlayerList().stream()
                 .filter(player -> isWatchingGrid(player, EnumGridType.NORMAL, EnumGridType.CRAFTING, EnumGridType.PATTERN))
-                .forEach(player -> RefinedStorage.INSTANCE.network.sendTo(new MessageGridItemDelta(this, stack, delta), player));
+                .forEach(player -> RS.INSTANCE.network.sendTo(new MessageGridItemDelta(this, stack, delta), player));
     }
 
     @Override
@@ -482,14 +482,14 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
 
     @Override
     public void sendFluidStorageToClient(EntityPlayerMP player) {
-        RefinedStorage.INSTANCE.network.sendTo(new MessageGridFluidUpdate(this), player);
+        RS.INSTANCE.network.sendTo(new MessageGridFluidUpdate(this), player);
     }
 
     @Override
     public void sendFluidStorageDeltaToClient(FluidStack stack, int delta) {
         worldObj.getMinecraftServer().getPlayerList().getPlayerList().stream()
                 .filter(player -> isWatchingGrid(player, EnumGridType.FLUID))
-                .forEach(player -> RefinedStorage.INSTANCE.network.sendTo(new MessageGridFluidDelta(stack, delta), player));
+                .forEach(player -> RS.INSTANCE.network.sendTo(new MessageGridFluidDelta(stack, delta), player));
     }
 
     private boolean isWatchingGrid(EntityPlayer player, EnumGridType... types) {
@@ -763,7 +763,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
 
     @Override
     public int getEnergyUsage() {
-        int usage = RefinedStorage.INSTANCE.config.controllerBaseUsage;
+        int usage = RS.INSTANCE.config.controllerBaseUsage;
 
         for (INetworkNode node : nodeGraph.all()) {
             if (node.canUpdate()) {
@@ -775,7 +775,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
     }
 
     public EnumControllerType getType() {
-        if (type == null && worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.CONTROLLER) {
+        if (type == null && worldObj.getBlockState(pos).getBlock() == RSBlocks.CONTROLLER) {
             this.type = (EnumControllerType) worldObj.getBlockState(pos).getValue(BlockController.TYPE);
         }
 

src/main/java/refinedstorage/tile/TileCrafter.java

@@ -8,7 +8,7 @@ import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.wrapper.CombinedInvWrapper;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.api.autocrafting.ICraftingPattern;
 import refinedstorage.api.autocrafting.ICraftingPatternContainer;
 import refinedstorage.api.autocrafting.ICraftingPatternProvider;
@@ -85,11 +85,11 @@ public class TileCrafter extends TileNode implements ICraftingPatternContainer {
 
     @Override
     public int getEnergyUsage() {
-        int usage = RefinedStorage.INSTANCE.config.crafterUsage + upgrades.getEnergyUsage();
+        int usage = RS.INSTANCE.config.crafterUsage + upgrades.getEnergyUsage();
 
         for (int i = 0; i < patterns.getSlots(); ++i) {
             if (patterns.getStackInSlot(i) != null) {
-                usage += RefinedStorage.INSTANCE.config.crafterPerPatternUsage;
+                usage += RS.INSTANCE.config.crafterPerPatternUsage;
             }
         }
 

src/main/java/refinedstorage/tile/TileCraftingMonitor.java

@@ -1,6 +1,6 @@
 package refinedstorage.tile;
 
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement;
 import refinedstorage.tile.data.ITileDataProducer;
 import refinedstorage.tile.data.RefinedStorageSerializers;
@@ -28,7 +28,7 @@ public class TileCraftingMonitor extends TileNode {
 
     @Override
     public int getEnergyUsage() {
-        return RefinedStorage.INSTANCE.config.craftingMonitorUsage;
+        return RS.INSTANCE.config.craftingMonitorUsage;
     }
 
     @Override

src/main/java/refinedstorage/tile/TileDestructor.java

@@ -18,7 +18,7 @@ import net.minecraftforge.fluids.capability.wrappers.BlockLiquidWrapper;
 import net.minecraftforge.fluids.capability.wrappers.FluidBlockWrapper;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.inventory.ItemHandlerBasic;
 import refinedstorage.inventory.ItemHandlerFluid;
@@ -64,7 +64,7 @@ public class TileDestructor extends TileMultipartNode implements IComparable, IF
 
     @Override
     public int getEnergyUsage() {
-        return RefinedStorage.INSTANCE.config.destructorUsage + upgrades.getEnergyUsage();
+        return RS.INSTANCE.config.destructorUsage + upgrades.getEnergyUsage();
     }
 
     @Override

src/main/java/refinedstorage/tile/TileDetector.java

@@ -9,8 +9,8 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.items.IItemHandler;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageBlocks;
+import refinedstorage.RS;
+import refinedstorage.RSBlocks;
 import refinedstorage.api.autocrafting.task.ICraftingTask;
 import refinedstorage.api.network.INetworkMaster;
 import refinedstorage.api.storage.CompareUtils;
@@ -99,7 +99,7 @@ public class TileDetector extends TileNode implements IComparable, IType {
 
     @Override
     public int getEnergyUsage() {
-        return RefinedStorage.INSTANCE.config.detectorUsage;
+        return RS.INSTANCE.config.detectorUsage;
     }
 
     @Override
@@ -154,7 +154,7 @@ public class TileDetector extends TileNode implements IComparable, IType {
         if (powered != wasPowered) {
             wasPowered = powered;
 
-            worldObj.notifyNeighborsOfStateChange(pos, RefinedStorageBlocks.DETECTOR);
+            worldObj.notifyNeighborsOfStateChange(pos, RSBlocks.DETECTOR);
 
             updateBlock();
         }

src/main/java/refinedstorage/tile/TileDiskDrive.java

@@ -10,8 +10,8 @@ import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.ItemHandlerHelper;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageItems;
+import refinedstorage.RS;
+import refinedstorage.RSItems;
 import refinedstorage.api.network.INetworkMaster;
 import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.api.storage.fluid.IFluidStorage;
@@ -157,11 +157,11 @@ public class TileDiskDrive extends TileNode implements IItemStorageProvider, IFl
 
     @Override
     public int getEnergyUsage() {
-        int usage = RefinedStorage.INSTANCE.config.diskDriveUsage;
+        int usage = RS.INSTANCE.config.diskDriveUsage;
 
         for (int i = 0; i < disks.getSlots(); ++i) {
             if (disks.getStackInSlot(i) != null) {
-                usage += RefinedStorage.INSTANCE.config.diskDrivePerDiskUsage;
+                usage += RS.INSTANCE.config.diskDrivePerDiskUsage;
             }
         }
 
@@ -324,13 +324,13 @@ public class TileDiskDrive extends TileNode implements IItemStorageProvider, IFl
                 ItemStack disk = disks.getStackInSlot(i);
 
                 if (disk != null) {
-                    int diskCapacity = disk.getItem() == RefinedStorageItems.STORAGE_DISK ? EnumItemStorageType.getById(disk.getItemDamage()).getCapacity() : EnumFluidStorageType.getById(disk.getItemDamage()).getCapacity();
+                    int diskCapacity = disk.getItem() == RSItems.STORAGE_DISK ? EnumItemStorageType.getById(disk.getItemDamage()).getCapacity() : EnumFluidStorageType.getById(disk.getItemDamage()).getCapacity();
 
                     if (diskCapacity == -1) {
                         return 0;
                     }
 
-                    stored += disk.getItem() == RefinedStorageItems.STORAGE_DISK ? ItemStorageNBT.getStoredFromNBT(disk.getTagCompound()) : FluidStorageNBT.getStoredFromNBT(disk.getTagCompound());
+                    stored += disk.getItem() == RSItems.STORAGE_DISK ? ItemStorageNBT.getStoredFromNBT(disk.getTagCompound()) : FluidStorageNBT.getStoredFromNBT(disk.getTagCompound());
                     capacity += diskCapacity;
                 }
             }
@@ -395,7 +395,7 @@ public class TileDiskDrive extends TileNode implements IItemStorageProvider, IFl
             ItemStack disk = disks.getStackInSlot(i);
 
             if (disk != null) {
-                stored += disk.getItem() == RefinedStorageItems.STORAGE_DISK ? ItemStorageNBT.getStoredFromNBT(disk.getTagCompound()) : FluidStorageNBT.getStoredFromNBT(disk.getTagCompound());
+                stored += disk.getItem() == RSItems.STORAGE_DISK ? ItemStorageNBT.getStoredFromNBT(disk.getTagCompound()) : FluidStorageNBT.getStoredFromNBT(disk.getTagCompound());
             }
         }
 
@@ -410,7 +410,7 @@ public class TileDiskDrive extends TileNode implements IItemStorageProvider, IFl
             ItemStack disk = disks.getStackInSlot(i);
 
             if (disk != null) {
-                int diskCapacity = disk.getItem() == RefinedStorageItems.STORAGE_DISK ? EnumItemStorageType.getById(disk.getItemDamage()).getCapacity() : EnumFluidStorageType.getById(disk.getItemDamage()).getCapacity();
+                int diskCapacity = disk.getItem() == RSItems.STORAGE_DISK ? EnumItemStorageType.getById(disk.getItemDamage()).getCapacity() : EnumFluidStorageType.getById(disk.getItemDamage()).getCapacity();
 
                 if (diskCapacity == -1) {
                     return -1;

src/main/java/refinedstorage/tile/TileDiskManipulator.java

@@ -11,7 +11,7 @@ import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.ItemHandlerHelper;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.apiimpl.storage.NBTStorage;
 import refinedstorage.apiimpl.storage.fluid.FluidStorageNBT;
@@ -164,7 +164,7 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
 
     @Override
     public int getEnergyUsage() {
-        return RefinedStorage.INSTANCE.config.diskManipulatorUsage + upgrades.getEnergyUsage();
+        return RS.INSTANCE.config.diskManipulatorUsage + upgrades.getEnergyUsage();
     }
 
     @Override

src/main/java/refinedstorage/tile/TileExporter.java

@@ -11,7 +11,7 @@ import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.ItemHandlerHelper;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.api.network.NetworkUtils;
 import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.inventory.ItemHandlerBasic;
@@ -49,7 +49,7 @@ public class TileExporter extends TileMultipartNode implements IComparable, ITyp
 
     @Override
     public int getEnergyUsage() {
-        return RefinedStorage.INSTANCE.config.exporterUsage + upgrades.getEnergyUsage();
+        return RS.INSTANCE.config.exporterUsage + upgrades.getEnergyUsage();
     }
 
     @Override

src/main/java/refinedstorage/tile/TileFluidInterface.java

@@ -8,7 +8,7 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTank;
 import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.apiimpl.storage.fluid.FluidUtils;
 import refinedstorage.inventory.ItemHandlerBasic;
@@ -141,7 +141,7 @@ public class TileFluidInterface extends TileNode implements IComparable {
 
     @Override
     public int getEnergyUsage() {
-        return RefinedStorage.INSTANCE.config.fluidInterfaceUsage;
+        return RS.INSTANCE.config.fluidInterfaceUsage;
     }
 
     @Override

src/main/java/refinedstorage/tile/TileFluidStorage.java

@@ -3,8 +3,8 @@ package refinedstorage.tile;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.datasync.DataSerializers;
 import net.minecraftforge.fluids.FluidStack;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageBlocks;
+import refinedstorage.RS;
+import refinedstorage.RSBlocks;
 import refinedstorage.api.network.INetworkMaster;
 import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.api.storage.fluid.IFluidStorage;
@@ -80,7 +80,7 @@ public class TileFluidStorage extends TileNode implements IFluidStorageProvider,
 
     @Override
     public int getEnergyUsage() {
-        return RefinedStorage.INSTANCE.config.fluidStorageUsage;
+        return RS.INSTANCE.config.fluidStorageUsage;
     }
 
     @Override
@@ -163,7 +163,7 @@ public class TileFluidStorage extends TileNode implements IFluidStorageProvider,
     }
 
     public EnumFluidStorageType getType() {
-        if (type == null && worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.FLUID_STORAGE) {
+        if (type == null && worldObj.getBlockState(pos).getBlock() == RSBlocks.FLUID_STORAGE) {
             this.type = ((EnumFluidStorageType) worldObj.getBlockState(pos).getValue(BlockFluidStorage.TYPE));
         }
 

src/main/java/refinedstorage/tile/TileImporter.java

@@ -10,7 +10,7 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.inventory.ItemHandlerBasic;
 import refinedstorage.inventory.ItemHandlerFluid;
@@ -54,7 +54,7 @@ public class TileImporter extends TileMultipartNode implements IComparable, IFil
 
     @Override
     public int getEnergyUsage() {
-        return RefinedStorage.INSTANCE.config.importerUsage + upgrades.getEnergyUsage();
+        return RS.INSTANCE.config.importerUsage + upgrades.getEnergyUsage();
     }
 
     @Override

src/main/java/refinedstorage/tile/TileInterface.java

@@ -7,7 +7,7 @@ import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.wrapper.CombinedInvWrapper;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.api.network.NetworkUtils;
 import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.inventory.ItemHandlerBasic;
@@ -36,7 +36,7 @@ public class TileInterface extends TileNode implements IComparable {
 
     @Override
     public int getEnergyUsage() {
-        return RefinedStorage.INSTANCE.config.interfaceUsage + upgrades.getEnergyUsage();
+        return RS.INSTANCE.config.interfaceUsage + upgrades.getEnergyUsage();
     }
 
     @Override

src/main/java/refinedstorage/tile/TileMultipartNode.java

@@ -16,7 +16,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
-import refinedstorage.RefinedStorageBlocks;
+import refinedstorage.RSBlocks;
 import refinedstorage.api.network.NetworkUtils;
 
 public abstract class TileMultipartNode extends TileNode implements IMicroblockContainerTile, ISlottedCapabilityProvider {
@@ -73,7 +73,7 @@ public abstract class TileMultipartNode extends TileNode implements IMicroblockC
         if (network != null) {
             NetworkUtils.rebuildGraph(network);
         } else if (worldObj != null) {
-            RefinedStorageBlocks.CABLE.attemptConnect(worldObj, pos);
+            RSBlocks.CABLE.attemptConnect(worldObj, pos);
         }
     }
 

src/main/java/refinedstorage/tile/TileNetworkReceiver.java

@@ -1,6 +1,6 @@
 package refinedstorage.tile;
 
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.tile.config.RedstoneMode;
 
 public class TileNetworkReceiver extends TileNode {
@@ -10,7 +10,7 @@ public class TileNetworkReceiver extends TileNode {
 
     @Override
     public int getEnergyUsage() {
-        return RefinedStorage.INSTANCE.config.networkReceiverUsage;
+        return RS.INSTANCE.config.networkReceiverUsage;
     }
 
     @Override

src/main/java/refinedstorage/tile/TileNetworkTransmitter.java

@@ -6,8 +6,8 @@ import net.minecraft.network.datasync.DataSerializers;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.wrapper.CombinedInvWrapper;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageItems;
+import refinedstorage.RS;
+import refinedstorage.RSItems;
 import refinedstorage.api.network.NetworkUtils;
 import refinedstorage.inventory.ItemHandlerBasic;
 import refinedstorage.inventory.ItemHandlerUpgrade;
@@ -50,7 +50,7 @@ public class TileNetworkTransmitter extends TileNode {
         }
     };
 
-    private ItemHandlerBasic networkCard = new ItemHandlerBasic(1, this, new ItemValidatorBasic(RefinedStorageItems.NETWORK_CARD)) {
+    private ItemHandlerBasic networkCard = new ItemHandlerBasic(1, this, new ItemValidatorBasic(RSItems.NETWORK_CARD)) {
         @Override
         protected void onContentsChanged(int slot) {
             super.onContentsChanged(slot);
@@ -109,7 +109,7 @@ public class TileNetworkTransmitter extends TileNode {
 
     @Override
     public int getEnergyUsage() {
-        return RefinedStorage.INSTANCE.config.networkTransmitterUsage + (isSameDimension() ? (int) Math.ceil(RefinedStorage.INSTANCE.config.networkTransmitterPerBlockUsage * getDistance()) : 0) + upgrades.getEnergyUsage();
+        return RS.INSTANCE.config.networkTransmitterUsage + (isSameDimension() ? (int) Math.ceil(RS.INSTANCE.config.networkTransmitterPerBlockUsage * getDistance()) : 0) + upgrades.getEnergyUsage();
     }
 
     public ItemHandlerBasic getNetworkCard() {

src/main/java/refinedstorage/tile/TileProcessingPatternEncoder.java

@@ -7,13 +7,13 @@ import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.ItemHandlerHelper;
-import refinedstorage.RefinedStorageItems;
+import refinedstorage.RSItems;
 import refinedstorage.inventory.ItemHandlerBasic;
 import refinedstorage.inventory.ItemValidatorBasic;
 import refinedstorage.item.ItemPattern;
 
 public class TileProcessingPatternEncoder extends TileBase {
-    private ItemHandlerBasic patterns = new ItemHandlerBasic(2, this, new ItemValidatorBasic(RefinedStorageItems.PATTERN));
+    private ItemHandlerBasic patterns = new ItemHandlerBasic(2, this, new ItemValidatorBasic(RSItems.PATTERN));
     private ItemHandlerBasic configuration = new ItemHandlerBasic(9 * 2, this);
 
     @Override
@@ -36,7 +36,7 @@ public class TileProcessingPatternEncoder extends TileBase {
 
     public void onCreatePattern() {
         if (canCreatePattern()) {
-            ItemStack pattern = new ItemStack(RefinedStorageItems.PATTERN);
+            ItemStack pattern = new ItemStack(RSItems.PATTERN);
 
             for (int i = 0; i < 18; ++i) {
                 if (configuration.getStackInSlot(i) != null) {

src/main/java/refinedstorage/tile/TileRelay.java

@@ -1,7 +1,7 @@
 package refinedstorage.tile;
 
 import net.minecraft.util.EnumFacing;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.tile.config.RedstoneMode;
 
 public class TileRelay extends TileNode {
@@ -13,7 +13,7 @@ public class TileRelay extends TileNode {
 
     @Override
     public int getEnergyUsage() {
-        return getRedstoneMode() == RedstoneMode.IGNORE ? 0 : RefinedStorage.INSTANCE.config.relayUsage;
+        return getRedstoneMode() == RedstoneMode.IGNORE ? 0 : RS.INSTANCE.config.relayUsage;
     }
 
     @Override

src/main/java/refinedstorage/tile/TileSolderer.java

@@ -8,8 +8,8 @@ import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.wrapper.CombinedInvWrapper;
-import refinedstorage.RefinedStorage;
-import refinedstorage.api.RefinedStorageAPI;
+import refinedstorage.RS;
+import refinedstorage.api.RSAPI;
 import refinedstorage.api.network.INetworkMaster;
 import refinedstorage.api.solderer.ISoldererRecipe;
 import refinedstorage.api.storage.CompareUtils;
@@ -52,7 +52,7 @@ public class TileSolderer extends TileNode {
         public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) {
             Set<Integer> possibleSlots = new HashSet<>();
 
-            for (ISoldererRecipe recipe : RefinedStorageAPI.instance().getSoldererRegistry().getRecipes()) {
+            for (ISoldererRecipe recipe : RSAPI.instance().getSoldererRegistry().getRecipes()) {
                 for (int i = 0; i < 3; ++i) {
                     if (CompareUtils.compareStackNoQuantity(recipe.getRow(i), stack) || CompareUtils.compareStackOreDict(recipe.getRow(i), stack)) {
                         possibleSlots.add(i);
@@ -84,7 +84,7 @@ public class TileSolderer extends TileNode {
 
     @Override
     public int getEnergyUsage() {
-        return RefinedStorage.INSTANCE.config.soldererUsage + upgrades.getEnergyUsage();
+        return RS.INSTANCE.config.soldererUsage + upgrades.getEnergyUsage();
     }
 
     @Override
@@ -92,7 +92,7 @@ public class TileSolderer extends TileNode {
         if (items.getStackInSlot(1) == null && items.getStackInSlot(2) == null && result.getStackInSlot(0) == null) {
             stop();
         } else {
-            ISoldererRecipe newRecipe = RefinedStorageAPI.instance().getSoldererRegistry().getRecipe(items);
+            ISoldererRecipe newRecipe = RSAPI.instance().getSoldererRegistry().getRecipe(items);
 
             if (newRecipe == null) {
                 stop();
@@ -157,7 +157,7 @@ public class TileSolderer extends TileNode {
         readItems(upgrades, 1, tag);
         readItems(result, 2, tag);
 
-        recipe = RefinedStorageAPI.instance().getSoldererRegistry().getRecipe(items);
+        recipe = RSAPI.instance().getSoldererRegistry().getRecipe(items);
 
         if (tag.hasKey(NBT_WORKING)) {
             working = tag.getBoolean(NBT_WORKING);

src/main/java/refinedstorage/tile/TileStorage.java

@@ -4,8 +4,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.datasync.DataSerializers;
 import net.minecraftforge.items.ItemHandlerHelper;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageBlocks;
+import refinedstorage.RS;
+import refinedstorage.RSBlocks;
 import refinedstorage.api.network.INetworkMaster;
 import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.api.storage.item.IItemStorage;
@@ -80,7 +80,7 @@ public class TileStorage extends TileNode implements IItemStorageProvider, IStor
 
     @Override
     public int getEnergyUsage() {
-        return RefinedStorage.INSTANCE.config.storageUsage;
+        return RS.INSTANCE.config.storageUsage;
     }
 
     @Override
@@ -163,7 +163,7 @@ public class TileStorage extends TileNode implements IItemStorageProvider, IStor
     }
 
     public EnumItemStorageType getType() {
-        if (type == null && worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.STORAGE) {
+        if (type == null && worldObj.getBlockState(pos).getBlock() == RSBlocks.STORAGE) {
             this.type = ((EnumItemStorageType) worldObj.getBlockState(pos).getValue(BlockStorage.TYPE));
         }
 

src/main/java/refinedstorage/tile/TileWirelessTransmitter.java

@@ -7,7 +7,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.api.network.IWirelessTransmitter;
 import refinedstorage.inventory.ItemHandlerBasic;
 import refinedstorage.inventory.ItemHandlerUpgrade;
@@ -31,7 +31,7 @@ public class TileWirelessTransmitter extends TileNode implements IWirelessTransm
 
     @Override
     public int getEnergyUsage() {
-        return RefinedStorage.INSTANCE.config.wirelessTransmitterUsage + upgrades.getEnergyUsage();
+        return RS.INSTANCE.config.wirelessTransmitterUsage + upgrades.getEnergyUsage();
     }
 
     @Override
@@ -56,7 +56,7 @@ public class TileWirelessTransmitter extends TileNode implements IWirelessTransm
 
     @Override
     public int getRange() {
-        return RefinedStorage.INSTANCE.config.wirelessTransmitterBaseRange + (upgrades.getUpgradeCount(ItemUpgrade.TYPE_RANGE) * RefinedStorage.INSTANCE.config.wirelessTransmitterRangePerUpgrade);
+        return RS.INSTANCE.config.wirelessTransmitterBaseRange + (upgrades.getUpgradeCount(ItemUpgrade.TYPE_RANGE) * RS.INSTANCE.config.wirelessTransmitterRangePerUpgrade);
     }
 
     @Override

src/main/java/refinedstorage/tile/data/RefinedStorageSerializers.java

@@ -7,7 +7,7 @@ import net.minecraft.network.datasync.DataSerializer;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fml.common.network.ByteBufUtils;
-import refinedstorage.api.RefinedStorageAPI;
+import refinedstorage.api.RSAPI;
 import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement;
 import refinedstorage.tile.ClientNode;
 
@@ -67,7 +67,7 @@ public final class RefinedStorageSerializers {
             int size = buf.readInt();
 
             for (int i = 0; i < size; ++i) {
-                Function<ByteBuf, ICraftingMonitorElement> factory = RefinedStorageAPI.instance().getCraftingMonitorElementRegistry().getFactory(ByteBufUtils.readUTF8String(buf));
+                Function<ByteBuf, ICraftingMonitorElement> factory = RSAPI.instance().getCraftingMonitorElementRegistry().getFactory(ByteBufUtils.readUTF8String(buf));
 
                 if (factory != null) {
                     elements.add(factory.apply(buf));

src/main/java/refinedstorage/tile/data/TileDataManager.java

@@ -4,7 +4,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.inventory.Container;
 import net.minecraft.tileentity.TileEntity;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.container.ContainerBase;
 import refinedstorage.network.MessageTileDataParameter;
 import refinedstorage.network.MessageTileDataParameterUpdate;
@@ -35,7 +35,7 @@ public class TileDataManager {
     }
 
     public static <T> void setParameter(TileDataParameter<T> parameter, T value) {
-        RefinedStorage.INSTANCE.network.sendToServer(new MessageTileDataParameterUpdate(parameter, value));
+        RS.INSTANCE.network.sendToServer(new MessageTileDataParameterUpdate(parameter, value));
     }
 
     private TileEntity tile;
@@ -81,7 +81,7 @@ public class TileDataManager {
     }
 
     public void sendParameter(EntityPlayerMP player, TileDataParameter<?> parameter) {
-        RefinedStorage.INSTANCE.network.sendTo(new MessageTileDataParameter(tile, parameter), player);
+        RS.INSTANCE.network.sendTo(new MessageTileDataParameter(tile, parameter), player);
     }
 
     public void sendParameterToWatchers(TileDataParameter<?> parameter) {

src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java

@@ -10,7 +10,7 @@ import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.fluids.capability.IFluidTankProperties;
 import net.minecraftforge.items.IItemHandler;
 import powercrystals.minefactoryreloaded.api.IDeepStorageUnit;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.api.network.INetworkMaster;
 import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.api.storage.fluid.IFluidStorage;
@@ -105,7 +105,7 @@ public class TileExternalStorage extends TileMultipartNode implements IItemStora
 
     @Override
     public int getEnergyUsage() {
-        return RefinedStorage.INSTANCE.config.externalStorageUsage + ((itemStorages.size() + fluidStorages.size()) * RefinedStorage.INSTANCE.config.externalStoragePerStorageUsage);
+        return RS.INSTANCE.config.externalStorageUsage + ((itemStorages.size() + fluidStorages.size()) * RS.INSTANCE.config.externalStoragePerStorageUsage);
     }
 
     @Override

src/main/java/refinedstorage/tile/grid/TileGrid.java

@@ -13,9 +13,9 @@ import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.ItemHandlerHelper;
 import net.minecraftforge.items.wrapper.CombinedInvWrapper;
 import net.minecraftforge.items.wrapper.InvWrapper;
-import refinedstorage.RefinedStorage;
-import refinedstorage.RefinedStorageBlocks;
-import refinedstorage.RefinedStorageItems;
+import refinedstorage.RS;
+import refinedstorage.RSBlocks;
+import refinedstorage.RSItems;
 import refinedstorage.api.network.NetworkUtils;
 import refinedstorage.api.network.grid.IFluidGridHandler;
 import refinedstorage.api.network.grid.IItemGridHandler;
@@ -141,7 +141,7 @@ public class TileGrid extends TileNode implements IGrid {
     private InventoryCrafting matrix = new InventoryCrafting(craftingContainer, 3, 3);
     private InventoryCraftResult result = new InventoryCraftResult();
 
-    private ItemHandlerBasic patterns = new ItemHandlerBasic(2, this, new ItemValidatorBasic(RefinedStorageItems.PATTERN));
+    private ItemHandlerBasic patterns = new ItemHandlerBasic(2, this, new ItemValidatorBasic(RSItems.PATTERN));
     private List<GridFilteredItem> filteredItems = new ArrayList<>();
     private ItemHandlerGridFilterInGrid filter = new ItemHandlerGridFilterInGrid(filteredItems);
 
@@ -163,13 +163,13 @@ public class TileGrid extends TileNode implements IGrid {
     public int getEnergyUsage() {
         switch (getType()) {
             case NORMAL:
-                return RefinedStorage.INSTANCE.config.gridUsage;
+                return RS.INSTANCE.config.gridUsage;
             case CRAFTING:
-                return RefinedStorage.INSTANCE.config.craftingGridUsage;
+                return RS.INSTANCE.config.craftingGridUsage;
             case PATTERN:
-                return RefinedStorage.INSTANCE.config.patternGridUsage;
+                return RS.INSTANCE.config.patternGridUsage;
             case FLUID:
-                return RefinedStorage.INSTANCE.config.fluidGridUsage;
+                return RS.INSTANCE.config.fluidGridUsage;
             default:
                 return 0;
         }
@@ -180,7 +180,7 @@ public class TileGrid extends TileNode implements IGrid {
     }
 
     public EnumGridType getType() {
-        if (type == null && worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.GRID) {
+        if (type == null && worldObj.getBlockState(pos).getBlock() == RSBlocks.GRID) {
             this.type = (EnumGridType) worldObj.getBlockState(pos).getValue(BlockGrid.TYPE);
         }
 
@@ -306,7 +306,7 @@ public class TileGrid extends TileNode implements IGrid {
         if (canCreatePattern()) {
             patterns.extractItem(0, 1, false);
 
-            ItemStack pattern = new ItemStack(RefinedStorageItems.PATTERN);
+            ItemStack pattern = new ItemStack(RSItems.PATTERN);
 
             for (int i = 0; i < 9; ++i) {
                 ItemStack ingredient = matrix.getStackInSlot(i);

src/main/java/refinedstorage/tile/grid/WirelessGrid.java

@@ -9,7 +9,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.DimensionManager;
 import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.relauncher.Side;
-import refinedstorage.RefinedStorage;
+import refinedstorage.RS;
 import refinedstorage.api.network.grid.IFluidGridHandler;
 import refinedstorage.api.network.grid.IItemGridHandler;
 import refinedstorage.block.EnumGridType;
@@ -124,7 +124,7 @@ public class WirelessGrid implements IGrid {
 
     @Override
     public void onViewTypeChanged(int type) {
-        RefinedStorage.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(type, getSortingDirection(), getSortingType(), getSearchBoxMode()));
+        RS.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(type, getSortingDirection(), getSortingType(), getSearchBoxMode()));
 
         this.viewType = type;
 
@@ -133,7 +133,7 @@ public class WirelessGrid implements IGrid {
 
     @Override
     public void onSortingTypeChanged(int type) {
-        RefinedStorage.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(getViewType(), getSortingDirection(), type, getSearchBoxMode()));
+        RS.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(getViewType(), getSortingDirection(), type, getSearchBoxMode()));
 
         this.sortingType = type;
 
@@ -142,7 +142,7 @@ public class WirelessGrid implements IGrid {
 
     @Override
     public void onSortingDirectionChanged(int direction) {
-        RefinedStorage.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(getViewType(), direction, getSortingType(), getSearchBoxMode()));
+        RS.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(getViewType(), direction, getSortingType(), getSearchBoxMode()));
 
         this.sortingDirection = direction;
 
@@ -151,7 +151,7 @@ public class WirelessGrid implements IGrid {
 
     @Override
     public void onSearchBoxModeChanged(int searchBoxMode) {
-        RefinedStorage.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(getViewType(), getSortingDirection(), getSortingType(), searchBoxMode));
+        RS.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(getViewType(), getSortingDirection(), getSortingType(), searchBoxMode));
 
         this.searchBoxMode = searchBoxMode;
     }