Package rename

build.gradle

@@ -81,7 +81,7 @@ task deobfJar(type: Jar) {
 task apiJar(type: Jar, dependsOn: 'sourceMainJava') {
     from sourceSets.main.allSource
     from sourceSets.main.output
-    include 'refinedstorage/api/**/*'
+    include 'com/raoulvdberge/refinedstorage/api/**/*'
     classifier 'api'
 }
 

src/main/java/com/raoulvdberge/refinedstorage/RS.java

@@ -1,5 +1,6 @@
-package refinedstorage;
+package com.raoulvdberge.refinedstorage;
 
+import com.raoulvdberge.refinedstorage.proxy.ProxyCommon;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -13,7 +14,6 @@ import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.network.NetworkRegistry;
 import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
-import refinedstorage.proxy.ProxyCommon;
 
 @Mod(modid = RS.ID, version = RS.VERSION, guiFactory = RS.GUI_FACTORY, dependencies = RS.DEPENDENCIES)
 public final class RS {
@@ -24,9 +24,9 @@ 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,);";
-    public static final String GUI_FACTORY = "refinedstorage.gui.config.ModGuiFactory";
+    public static final String GUI_FACTORY = "com.raoulvdberge.refinedstorage.gui.config.ModGuiFactory";
 
-    @SidedProxy(clientSide = "refinedstorage.proxy.ProxyClient", serverSide = "refinedstorage.proxy.ProxyCommon")
+    @SidedProxy(clientSide = "com.raoulvdberge.refinedstorage.proxy.ProxyClient", serverSide = "com.raoulvdberge.refinedstorage.proxy.ProxyCommon")
     public static ProxyCommon PROXY;
 
     @Instance

src/main/java/com/raoulvdberge/refinedstorage/RSBlocks.java

@@ -1,6 +1,6 @@
-package refinedstorage;
+package com.raoulvdberge.refinedstorage;
 
-import refinedstorage.block.*;
+import com.raoulvdberge.refinedstorage.block.*;
 
 public final class RSBlocks {
     public static final BlockController CONTROLLER = new BlockController();

src/main/java/com/raoulvdberge/refinedstorage/RSConfig.java

@@ -1,4 +1,4 @@
-package refinedstorage;
+package com.raoulvdberge.refinedstorage;
 
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.config.ConfigElement;

src/main/java/com/raoulvdberge/refinedstorage/RSGui.java

@@ -1,4 +1,4 @@
-package refinedstorage;
+package com.raoulvdberge.refinedstorage;
 
 public final class RSGui {
     public static final int CONTROLLER = 0;

src/main/java/com/raoulvdberge/refinedstorage/RSItems.java

@@ -1,6 +1,6 @@
-package refinedstorage;
+package com.raoulvdberge.refinedstorage;
 
-import refinedstorage.item.*;
+import com.raoulvdberge.refinedstorage.item.*;
 
 public final class RSItems {
     public static final ItemStorageDisk STORAGE_DISK = new ItemStorageDisk();

src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java

@@ -1,5 +1,12 @@
-package refinedstorage;
+package com.raoulvdberge.refinedstorage;
 
+import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
+import com.raoulvdberge.refinedstorage.api.storage.AccessType;
+import com.raoulvdberge.refinedstorage.api.util.IFluidStackList;
+import com.raoulvdberge.refinedstorage.api.util.IItemStackList;
+import com.raoulvdberge.refinedstorage.apiimpl.API;
+import com.raoulvdberge.refinedstorage.apiimpl.storage.fluid.FluidStorageNBT;
+import com.raoulvdberge.refinedstorage.apiimpl.storage.item.ItemStorageNBT;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.init.Items;
 import net.minecraft.inventory.IInventory;
@@ -24,13 +31,6 @@ import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.wrapper.InvWrapper;
 import net.minecraftforge.items.wrapper.SidedInvWrapper;
 import org.apache.commons.lang3.tuple.Pair;
-import refinedstorage.api.network.INetworkMaster;
-import refinedstorage.api.storage.AccessType;
-import refinedstorage.api.util.IFluidStackList;
-import refinedstorage.api.util.IItemStackList;
-import refinedstorage.apiimpl.API;
-import refinedstorage.apiimpl.storage.fluid.FluidStorageNBT;
-import refinedstorage.apiimpl.storage.item.ItemStorageNBT;
 
 import java.util.Locale;
 import java.util.function.Function;

src/main/java/com/raoulvdberge/refinedstorage/api/IRSAPI.java

@@ -1,14 +1,14 @@
-package refinedstorage.api;
+package com.raoulvdberge.refinedstorage.api;
 
+import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry;
+import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry;
+import com.raoulvdberge.refinedstorage.api.autocrafting.registry.ICraftingTaskRegistry;
+import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRegistry;
+import com.raoulvdberge.refinedstorage.api.util.IComparer;
+import com.raoulvdberge.refinedstorage.api.util.IFluidStackList;
+import com.raoulvdberge.refinedstorage.api.util.IItemStackList;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
-import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry;
-import refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry;
-import refinedstorage.api.autocrafting.registry.ICraftingTaskRegistry;
-import refinedstorage.api.solderer.ISoldererRegistry;
-import refinedstorage.api.util.IComparer;
-import refinedstorage.api.util.IFluidStackList;
-import refinedstorage.api.util.IItemStackList;
 
 import javax.annotation.Nonnull;
 

src/main/java/com/raoulvdberge/refinedstorage/api/RSAPIInject.java

@@ -1,4 +1,4 @@
-package refinedstorage.api;
+package com.raoulvdberge.refinedstorage.api;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;

src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPattern.java

@@ -1,7 +1,7 @@
-package refinedstorage.api.autocrafting;
+package com.raoulvdberge.refinedstorage.api.autocrafting;
 
+import com.raoulvdberge.refinedstorage.api.util.IComparer;
 import net.minecraft.item.ItemStack;
-import refinedstorage.api.util.IComparer;
 
 import java.util.List;
 
@@ -80,7 +80,7 @@ public interface ICraftingPattern {
      * Returns the quantity of items that this crafting task yields per request.
      *
      * @param requested the item requested
-     * @param compare the {@link refinedstorage.api.util.IComparer} flags
+     * @param compare   the {@link IComparer} flags
      * @return the quantity
      */
     int getQuantityPerRequest(ItemStack requested, int compare);

src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternContainer.java

@@ -1,4 +1,4 @@
-package refinedstorage.api.autocrafting;
+package com.raoulvdberge.refinedstorage.api.autocrafting;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;

src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternProvider.java

@@ -1,4 +1,4 @@
-package refinedstorage.api.autocrafting;
+package com.raoulvdberge.refinedstorage.api.autocrafting;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;

src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElement.java

@@ -1,9 +1,9 @@
-package refinedstorage.api.autocrafting.craftingmonitor;
+package com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor;
 
+import com.raoulvdberge.refinedstorage.api.render.IElementDrawers;
 import io.netty.buffer.ByteBuf;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import refinedstorage.api.render.IElementDrawers;
 
 /**
  * Represents a crafting monitor element.

src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementRegistry.java

@@ -1,4 +1,4 @@
-package refinedstorage.api.autocrafting.craftingmonitor;
+package com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor;
 
 import io.netty.buffer.ByteBuf;
 

src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java

@@ -1,12 +1,9 @@
-package refinedstorage.api.autocrafting.preview;
+package com.raoulvdberge.refinedstorage.api.autocrafting.preview;
 
+import com.raoulvdberge.refinedstorage.api.render.IElementDrawers;
 import io.netty.buffer.ByteBuf;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import refinedstorage.api.render.IElementDrawer;
-import refinedstorage.api.render.IElementDrawers;
 
 public interface ICraftingPreviewElement<T> {
     /**
@@ -15,8 +12,8 @@ public interface ICraftingPreviewElement<T> {
     T getElement();
 
     /**
-     * @param x   position on the x axis to render
+     * @param x       position on the x axis to render
-     * @param y   position on the y axis to render
+     * @param y       position on the y axis to render
      * @param drawers the drawers this element can use
      */
     @SideOnly(Side.CLIENT)

src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/preview/ICraftingPreviewElementRegistry.java

@@ -1,4 +1,4 @@
-package refinedstorage.api.autocrafting.preview;
+package com.raoulvdberge.refinedstorage.api.autocrafting.preview;
 
 import io.netty.buffer.ByteBuf;
 

src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/registry/ICraftingTaskFactory.java

@@ -1,11 +1,11 @@
-package refinedstorage.api.autocrafting.registry;
+package com.raoulvdberge.refinedstorage.api.autocrafting.registry;
 
+import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
+import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask;
+import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import refinedstorage.api.autocrafting.ICraftingPattern;
-import refinedstorage.api.autocrafting.task.ICraftingTask;
-import refinedstorage.api.network.INetworkMaster;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/registry/ICraftingTaskRegistry.java

@@ -1,4 +1,4 @@
-package refinedstorage.api.autocrafting.registry;
+package com.raoulvdberge.refinedstorage.api.autocrafting.registry;
 
 import javax.annotation.Nullable;
 

src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingTask.java

@@ -1,10 +1,10 @@
-package refinedstorage.api.autocrafting.task;
+package com.raoulvdberge.refinedstorage.api.autocrafting.task;
 
+import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
+import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement;
+import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import refinedstorage.api.autocrafting.ICraftingPattern;
-import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement;
-import refinedstorage.api.autocrafting.preview.ICraftingPreviewElement;
 
 import javax.annotation.Nullable;
 import java.util.List;

src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/IProcessable.java

@@ -1,9 +1,9 @@
-package refinedstorage.api.autocrafting.task;
+package com.raoulvdberge.refinedstorage.api.autocrafting.task;
 
+import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
+import com.raoulvdberge.refinedstorage.api.util.IItemStackList;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import refinedstorage.api.autocrafting.ICraftingPattern;
-import refinedstorage.api.util.IItemStackList;
 
 /**
  * Represents a item in a crafting task that can be processed.

src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkMaster.java

@@ -1,19 +1,19 @@
-package refinedstorage.api.network;
+package com.raoulvdberge.refinedstorage.api.network;
 
 import cofh.api.energy.EnergyStorage;
+import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
+import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask;
+import com.raoulvdberge.refinedstorage.api.network.grid.IFluidGridHandler;
+import com.raoulvdberge.refinedstorage.api.network.grid.IItemGridHandler;
+import com.raoulvdberge.refinedstorage.api.storage.fluid.IFluidStorageCache;
+import com.raoulvdberge.refinedstorage.api.storage.item.IItemStorageCache;
+import com.raoulvdberge.refinedstorage.api.util.IComparer;
+import com.raoulvdberge.refinedstorage.apiimpl.API;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidStack;
-import refinedstorage.api.autocrafting.ICraftingPattern;
-import refinedstorage.api.autocrafting.task.ICraftingTask;
-import refinedstorage.api.network.grid.IFluidGridHandler;
-import refinedstorage.api.network.grid.IItemGridHandler;
-import refinedstorage.api.storage.fluid.IFluidStorageCache;
-import refinedstorage.api.storage.item.IItemStorageCache;
-import refinedstorage.api.util.IComparer;
-import refinedstorage.apiimpl.API;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNode.java

@@ -1,4 +1,4 @@
-package refinedstorage.api.network;
+package com.raoulvdberge.refinedstorage.api.network;
 
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;

src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNodeGraph.java

@@ -1,4 +1,4 @@
-package refinedstorage.api.network;
+package com.raoulvdberge.refinedstorage.api.network;
 
 import net.minecraft.util.math.BlockPos;
 

src/main/java/com/raoulvdberge/refinedstorage/api/network/IWirelessGridConsumer.java

@@ -1,4 +1,4 @@
-package refinedstorage.api.network;
+package com.raoulvdberge.refinedstorage.api.network;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;

src/main/java/com/raoulvdberge/refinedstorage/api/network/IWirelessGridHandler.java

@@ -1,4 +1,4 @@
-package refinedstorage.api.network;
+package com.raoulvdberge.refinedstorage.api.network;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.EnumHand;

src/main/java/com/raoulvdberge/refinedstorage/api/network/IWirelessTransmitter.java

@@ -1,4 +1,4 @@
-package refinedstorage.api.network;
+package com.raoulvdberge.refinedstorage.api.network;
 
 import net.minecraft.util.math.BlockPos;
 

src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IFluidGridHandler.java

@@ -1,5 +1,6 @@
-package refinedstorage.api.network.grid;
+package com.raoulvdberge.refinedstorage.api.network.grid;
 
+import com.raoulvdberge.refinedstorage.api.IRSAPI;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
@@ -13,7 +14,7 @@ public interface IFluidGridHandler {
     /**
      * Called when a player tries to extract a fluid from the grid.
      *
-     * @param hash   the hash of the fluid we're trying to extract, see {@link refinedstorage.api.IRSAPI#getFluidStackHashCode(FluidStack)}
+     * @param hash   the hash of the fluid we're trying to extract, see {@link IRSAPI#getFluidStackHashCode(FluidStack)}
      * @param shift  true if shift click was used, false otherwise
      * @param player the player that is attempting the extraction
      */

src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IItemGridHandler.java

@@ -1,5 +1,6 @@
-package refinedstorage.api.network.grid;
+package com.raoulvdberge.refinedstorage.api.network.grid;
 
+import com.raoulvdberge.refinedstorage.api.IRSAPI;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 
@@ -16,7 +17,7 @@ public interface IItemGridHandler {
     /**
      * Called when a player tries to extract an item from the grid.
      *
-     * @param hash   the hash of the item we're trying to extract, see {@link refinedstorage.api.IRSAPI#getItemStackHashCode(ItemStack)}
+     * @param hash   the hash of the item we're trying to extract, see {@link IRSAPI#getItemStackHashCode(ItemStack)}
      * @param flags  how we are extracting
      * @param player the player that is attempting the extraction
      */
@@ -43,7 +44,7 @@ public interface IItemGridHandler {
     /**
      * Called when a player requests the crafting preview window to be opened.
      *
-     * @param hash     the hash of the item we want a preview for, see {@link refinedstorage.api.IRSAPI#getItemStackHashCode(ItemStack)}
+     * @param hash     the hash of the item we want a preview for, see {@link IRSAPI#getItemStackHashCode(ItemStack)}
      * @param quantity the amount of that item that we need a preview for
      */
     void onCraftingPreviewRequested(EntityPlayerMP player, int hash, int quantity);
@@ -51,7 +52,7 @@ public interface IItemGridHandler {
     /**
      * Called when a player requested crafting for an item.
      *
-     * @param hash     the hash of the item we're requesting crafting for, see {@link refinedstorage.api.IRSAPI#getItemStackHashCode(ItemStack)}
+     * @param hash     the hash of the item we're requesting crafting for, see {@link IRSAPI#getItemStackHashCode(ItemStack)}
      * @param quantity the amount of that item that has to be crafted
      */
     void onCraftingRequested(int hash, int quantity);

src/main/java/com/raoulvdberge/refinedstorage/api/render/IElementDrawer.java

@@ -0,0 +1,22 @@
+package com.raoulvdberge.refinedstorage.api.render;
+
+import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement;
+import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement;
+
+/**
+ * This {@link FunctionalInterface} is used to define a draw/render function.
+ * This function use x and y coords and the element to draw.
+ * Usually packaged in a {@link IElementDrawers}.
+ * Used in {@link ICraftingPreviewElement#draw(int, int, IElementDrawers)} and {@link ICraftingMonitorElement#draw(int, int, IElementDrawers)}
+ *
+ * @param <T> the element to draw, usually {@link String}, {@link net.minecraft.item.ItemStack} or {@link net.minecraftforge.fluids.FluidStack}
+ */
+@FunctionalInterface
+public interface IElementDrawer<T> {
+    /**
+     * @param x       the x axis
+     * @param y       the y axis
+     * @param element the element type
+     */
+    void draw(int x, int y, T element);
+}

src/main/java/com/raoulvdberge/refinedstorage/api/render/IElementDrawers.java

@@ -1,22 +1,36 @@
-package refinedstorage.api.render;
+package com.raoulvdberge.refinedstorage.api.render;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
-import refinedstorage.api.render.IElementDrawer;
 
+/**
+ * Interface specifying default element drawers.
+ */
 public interface IElementDrawers {
+    /**
+     * @return an item drawer
+     */
     default IElementDrawer<ItemStack> getItemDrawer() {
         return getNullDrawer();
     }
 
+    /**
+     * @return a fluid drawer
+     */
     default IElementDrawer<FluidStack> getFluidDrawer() {
         return getNullDrawer();
     }
 
+    /**
+     * @return a string drawer
+     */
     default IElementDrawer<String> getStringDrawer() {
         return getNullDrawer();
     }
 
+    /**
+     * @return a red overlay drawer
+     */
     default IElementDrawer<?> getRedOverlayDrawer() {
         return getNullDrawer();
     }
@@ -25,9 +39,10 @@ public interface IElementDrawers {
      * DO NOT OVERRIDE
      *
      * @param <T> any type of drawer
-     * @return A drawer that does nothing
+     * @return a drawer that does nothing
      */
     default <T> IElementDrawer<T> getNullDrawer() {
-        return (x, y, element) -> {};
+        return (x, y, element) -> {
+        };
     }
 }

src/main/java/com/raoulvdberge/refinedstorage/api/solderer/ISoldererRecipe.java

@@ -1,4 +1,4 @@
-package refinedstorage.api.solderer;
+package com.raoulvdberge.refinedstorage.api.solderer;
 
 import net.minecraft.item.ItemStack;
 

src/main/java/com/raoulvdberge/refinedstorage/api/solderer/ISoldererRegistry.java

@@ -1,4 +1,4 @@
-package refinedstorage.api.solderer;
+package com.raoulvdberge.refinedstorage.api.solderer;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;

src/main/java/com/raoulvdberge/refinedstorage/api/storage/AccessType.java

@@ -1,4 +1,4 @@
-package refinedstorage.api.storage;
+package com.raoulvdberge.refinedstorage.api.storage;
 
 /**
  * The access type of a storage.

src/main/java/com/raoulvdberge/refinedstorage/api/storage/fluid/IFluidStorage.java

@@ -1,7 +1,8 @@
-package refinedstorage.api.storage.fluid;
+package com.raoulvdberge.refinedstorage.api.storage.fluid;
 
+import com.raoulvdberge.refinedstorage.api.storage.AccessType;
+import com.raoulvdberge.refinedstorage.api.util.IComparer;
 import net.minecraftforge.fluids.FluidStack;
-import refinedstorage.api.storage.AccessType;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -35,7 +36,7 @@ public interface IFluidStorage {
      *
      * @param stack a prototype of the fluid to extract, do NOT modify
      * @param size  the amount of that fluid that has to be extracted
-     * @param flags the flags to compare on, see {@link refinedstorage.api.util.IComparer}
+     * @param flags the flags to compare on, see {@link IComparer}
      * @return null if we didn't extract anything, or a stack with the result
      */
     @Nullable

src/main/java/com/raoulvdberge/refinedstorage/api/storage/fluid/IFluidStorageCache.java

@@ -1,8 +1,8 @@
-package refinedstorage.api.storage.fluid;
+package com.raoulvdberge.refinedstorage.api.storage.fluid;
 
+import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
+import com.raoulvdberge.refinedstorage.api.util.IFluidStackList;
 import net.minecraftforge.fluids.FluidStack;
-import refinedstorage.api.network.INetworkMaster;
-import refinedstorage.api.util.IFluidStackList;
 
 import javax.annotation.Nonnull;
 import java.util.List;

src/main/java/com/raoulvdberge/refinedstorage/api/storage/fluid/IFluidStorageProvider.java

@@ -1,4 +1,4 @@
-package refinedstorage.api.storage.fluid;
+package com.raoulvdberge.refinedstorage.api.storage.fluid;
 
 import java.util.List;
 

src/main/java/com/raoulvdberge/refinedstorage/api/storage/item/IItemStorage.java

@@ -1,7 +1,8 @@
-package refinedstorage.api.storage.item;
+package com.raoulvdberge.refinedstorage.api.storage.item;
 
+import com.raoulvdberge.refinedstorage.api.storage.AccessType;
+import com.raoulvdberge.refinedstorage.api.util.IComparer;
 import net.minecraft.item.ItemStack;
-import refinedstorage.api.storage.AccessType;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -35,7 +36,7 @@ public interface IItemStorage {
      *
      * @param stack a prototype of the stack to extract, do NOT modify
      * @param size  the amount of that prototype that has to be extracted
-     * @param flags the flags to compare on, see {@link refinedstorage.api.util.IComparer}
+     * @param flags the flags to compare on, see {@link IComparer}
      * @return null if we didn't extract anything, or a stack with the result
      */
     @Nullable

src/main/java/com/raoulvdberge/refinedstorage/api/storage/item/IItemStorageCache.java

@@ -1,8 +1,8 @@
-package refinedstorage.api.storage.item;
+package com.raoulvdberge.refinedstorage.api.storage.item;
 
+import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
+import com.raoulvdberge.refinedstorage.api.util.IItemStackList;
 import net.minecraft.item.ItemStack;
-import refinedstorage.api.network.INetworkMaster;
-import refinedstorage.api.util.IItemStackList;
 
 import javax.annotation.Nonnull;
 import java.util.List;

src/main/java/com/raoulvdberge/refinedstorage/api/storage/item/IItemStorageProvider.java

@@ -1,4 +1,4 @@
-package refinedstorage.api.storage.item;
+package com.raoulvdberge.refinedstorage.api.storage.item;
 
 import java.util.List;
 

src/main/java/com/raoulvdberge/refinedstorage/api/util/IComparer.java

@@ -1,4 +1,4 @@
-package refinedstorage.api.util;
+package com.raoulvdberge.refinedstorage.api.util;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;

src/main/java/com/raoulvdberge/refinedstorage/api/util/IFluidStackList.java

@@ -1,5 +1,6 @@
-package refinedstorage.api.util;
+package com.raoulvdberge.refinedstorage.api.util;
 
+import com.raoulvdberge.refinedstorage.api.IRSAPI;
 import net.minecraftforge.fluids.FluidStack;
 
 import javax.annotation.Nonnull;
@@ -62,7 +63,7 @@ public interface IFluidStackList {
     /**
      * Returns a stack.
      *
-     * @param hash the hash of the stack to search for, see {@link refinedstorage.api.IRSAPI#getFluidStackHashCode(FluidStack)}
+     * @param hash the hash of the stack to search for, see {@link IRSAPI#getFluidStackHashCode(FluidStack)}
      * @return the stack, or null if no stack was found
      */
     @Nullable

src/main/java/com/raoulvdberge/refinedstorage/api/util/IItemStackList.java

@@ -1,5 +1,6 @@
-package refinedstorage.api.util;
+package com.raoulvdberge.refinedstorage.api.util;
 
+import com.raoulvdberge.refinedstorage.api.IRSAPI;
 import net.minecraft.item.ItemStack;
 
 import javax.annotation.Nonnull;
@@ -62,7 +63,7 @@ public interface IItemStackList {
     /**
      * Returns a stack.
      *
-     * @param hash the hash of the stack to search for, see {@link refinedstorage.api.IRSAPI#getItemStackHashCode(ItemStack)}
+     * @param hash the hash of the stack to search for, see {@link IRSAPI#getItemStackHashCode(ItemStack)}
      * @return the stack, or null if no stack was found
      */
     @Nullable
@@ -74,7 +75,7 @@ public interface IItemStackList {
     void clear();
 
     /**
-     *  Removes all stacks with size zero
+     * Removes all stacks with size zero
      */
     void clean();
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java

@@ -1,24 +1,24 @@
-package refinedstorage.apiimpl;
+package com.raoulvdberge.refinedstorage.apiimpl;
 
+import com.raoulvdberge.refinedstorage.api.IRSAPI;
+import com.raoulvdberge.refinedstorage.api.RSAPIInject;
+import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry;
+import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry;
+import com.raoulvdberge.refinedstorage.api.autocrafting.registry.ICraftingTaskRegistry;
+import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRegistry;
+import com.raoulvdberge.refinedstorage.api.util.IComparer;
+import com.raoulvdberge.refinedstorage.api.util.IFluidStackList;
+import com.raoulvdberge.refinedstorage.api.util.IItemStackList;
+import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementRegistry;
+import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementRegistry;
+import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.registry.CraftingTaskRegistry;
+import com.raoulvdberge.refinedstorage.apiimpl.solderer.SoldererRegistry;
+import com.raoulvdberge.refinedstorage.apiimpl.util.Comparer;
+import com.raoulvdberge.refinedstorage.apiimpl.util.FluidStackList;
+import com.raoulvdberge.refinedstorage.apiimpl.util.ItemStackList;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fml.common.discovery.ASMDataTable;
-import refinedstorage.api.IRSAPI;
-import refinedstorage.api.RSAPIInject;
-import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry;
-import refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry;
-import refinedstorage.api.autocrafting.registry.ICraftingTaskRegistry;
-import refinedstorage.api.solderer.ISoldererRegistry;
-import refinedstorage.api.util.IComparer;
-import refinedstorage.api.util.IFluidStackList;
-import refinedstorage.api.util.IItemStackList;
-import refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementRegistry;
-import refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementRegistry;
-import refinedstorage.apiimpl.autocrafting.registry.CraftingTaskRegistry;
-import refinedstorage.apiimpl.solderer.SoldererRegistry;
-import refinedstorage.apiimpl.util.Comparer;
-import refinedstorage.apiimpl.util.FluidStackList;
-import refinedstorage.apiimpl.util.ItemStackList;
 
 import javax.annotation.Nonnull;
 import java.lang.reflect.Field;

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java

@@ -1,17 +1,16 @@
-package refinedstorage.apiimpl.autocrafting;
+package com.raoulvdberge.refinedstorage.apiimpl.autocrafting;
 
+import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
+import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternContainer;
+import com.raoulvdberge.refinedstorage.apiimpl.API;
+import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.registry.CraftingTaskFactory;
+import com.raoulvdberge.refinedstorage.item.ItemPattern;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.world.World;
-import net.minecraftforge.items.ItemHandlerHelper;
-import refinedstorage.api.autocrafting.ICraftingPattern;
-import refinedstorage.api.autocrafting.ICraftingPatternContainer;
-import refinedstorage.apiimpl.API;
-import refinedstorage.apiimpl.autocrafting.registry.CraftingTaskFactory;
-import refinedstorage.item.ItemPattern;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementError.java

@@ -1,9 +1,9 @@
-package refinedstorage.apiimpl.autocrafting.craftingmonitor;
+package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor;
 
+import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement;
+import com.raoulvdberge.refinedstorage.api.render.IElementDrawers;
 import io.netty.buffer.ByteBuf;
 import net.minecraftforge.fml.common.network.ByteBufUtils;
-import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement;
-import refinedstorage.api.render.IElementDrawers;
 
 public class CraftingMonitorElementError implements ICraftingMonitorElement {
     public static final String ID = "error";

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementFluidRender.java

@@ -1,14 +1,14 @@
-package refinedstorage.apiimpl.autocrafting.craftingmonitor;
+package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor;
 
+import com.raoulvdberge.refinedstorage.RSUtils;
+import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement;
+import com.raoulvdberge.refinedstorage.api.render.IElementDrawers;
+import com.raoulvdberge.refinedstorage.gui.GuiBase;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import refinedstorage.RSUtils;
-import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement;
-import refinedstorage.api.render.IElementDrawers;
-import refinedstorage.gui.GuiBase;
 
 public class CraftingMonitorElementFluidRender implements ICraftingMonitorElement<FluidStack> {
     public static final String ID = "fluid_render";

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementItemRender.java

@@ -1,14 +1,14 @@
-package refinedstorage.apiimpl.autocrafting.craftingmonitor;
+package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor;
 
+import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement;
+import com.raoulvdberge.refinedstorage.api.render.IElementDrawers;
+import com.raoulvdberge.refinedstorage.gui.GuiBase;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.common.network.ByteBufUtils;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement;
-import refinedstorage.api.render.IElementDrawers;
-import refinedstorage.gui.GuiBase;
 
 public class CraftingMonitorElementItemRender implements ICraftingMonitorElement<ItemStack> {
     public static final String ID = "item_render";

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementRegistry.java

@@ -1,8 +1,8 @@
-package refinedstorage.apiimpl.autocrafting.craftingmonitor;
+package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor;
 
+import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement;
+import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry;
 import io.netty.buffer.ByteBuf;
-import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement;
-import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry;
 
 import javax.annotation.Nullable;
 import java.util.HashMap;

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementText.java

@@ -1,14 +1,14 @@
-package refinedstorage.apiimpl.autocrafting.craftingmonitor;
+package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor;
 
+import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement;
+import com.raoulvdberge.refinedstorage.api.render.IElementDrawers;
+import com.raoulvdberge.refinedstorage.gui.GuiBase;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.resources.I18n;
 import net.minecraftforge.fml.common.network.ByteBufUtils;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement;
-import refinedstorage.api.render.IElementDrawers;
-import refinedstorage.gui.GuiBase;
 
 public class CraftingMonitorElementText implements ICraftingMonitorElement<String> {
     public static final String ID = "text";

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementFluidStack.java

@@ -1,8 +1,10 @@
-package refinedstorage.apiimpl.autocrafting.preview;
+package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview;
 
+import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement;
+import com.raoulvdberge.refinedstorage.api.render.IElementDrawers;
+import com.raoulvdberge.refinedstorage.gui.GuiBase;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
@@ -10,10 +12,6 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fml.common.network.ByteBufUtils;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import refinedstorage.api.autocrafting.preview.ICraftingPreviewElement;
-import refinedstorage.api.render.IElementDrawer;
-import refinedstorage.api.render.IElementDrawers;
-import refinedstorage.gui.GuiBase;
 
 public class CraftingPreviewElementFluidStack implements ICraftingPreviewElement<FluidStack> {
     public static final String ID = "fluid_renderer";

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementItemStack.java

@@ -1,19 +1,17 @@
-package refinedstorage.apiimpl.autocrafting.preview;
+package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview;
 
+import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement;
+import com.raoulvdberge.refinedstorage.api.render.IElementDrawers;
+import com.raoulvdberge.refinedstorage.gui.GuiBase;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fml.common.network.ByteBufUtils;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import net.minecraftforge.items.ItemHandlerHelper;
-import refinedstorage.api.autocrafting.preview.ICraftingPreviewElement;
-import refinedstorage.api.render.IElementDrawer;
-import refinedstorage.api.render.IElementDrawers;
-import refinedstorage.gui.GuiBase;
 
 public class CraftingPreviewElementItemStack implements ICraftingPreviewElement<ItemStack> {
     public static final String ID = "item_renderer";

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementRegistry.java

@@ -1,8 +1,8 @@
-package refinedstorage.apiimpl.autocrafting.preview;
+package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview;
 
+import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement;
+import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry;
 import io.netty.buffer.ByteBuf;
-import refinedstorage.api.autocrafting.preview.ICraftingPreviewElement;
-import refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry;
 
 import javax.annotation.Nullable;
 import java.util.HashMap;

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskFactory.java

@@ -1,21 +1,21 @@
-package refinedstorage.apiimpl.autocrafting.registry;
+package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.registry;
 
+import com.raoulvdberge.refinedstorage.RSUtils;
+import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
+import com.raoulvdberge.refinedstorage.api.autocrafting.registry.ICraftingTaskFactory;
+import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask;
+import com.raoulvdberge.refinedstorage.api.autocrafting.task.IProcessable;
+import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
+import com.raoulvdberge.refinedstorage.api.util.IFluidStackList;
+import com.raoulvdberge.refinedstorage.api.util.IItemStackList;
+import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingTask;
+import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.Processable;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.fluids.FluidStack;
-import refinedstorage.RSUtils;
-import refinedstorage.api.autocrafting.ICraftingPattern;
-import refinedstorage.api.autocrafting.registry.ICraftingTaskFactory;
-import refinedstorage.api.autocrafting.task.ICraftingTask;
-import refinedstorage.api.autocrafting.task.IProcessable;
-import refinedstorage.api.network.INetworkMaster;
-import refinedstorage.api.util.IFluidStackList;
-import refinedstorage.api.util.IItemStackList;
-import refinedstorage.apiimpl.autocrafting.task.CraftingTask;
-import refinedstorage.apiimpl.autocrafting.task.Processable;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskRegistry.java

@@ -1,7 +1,7 @@
-package refinedstorage.apiimpl.autocrafting.registry;
+package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.registry;
 
-import refinedstorage.api.autocrafting.registry.ICraftingTaskFactory;
+import com.raoulvdberge.refinedstorage.api.autocrafting.registry.ICraftingTaskFactory;
-import refinedstorage.api.autocrafting.registry.ICraftingTaskRegistry;
+import com.raoulvdberge.refinedstorage.api.autocrafting.registry.ICraftingTaskRegistry;
 
 import javax.annotation.Nullable;
 import java.util.HashMap;

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java

@@ -1,33 +1,32 @@
-package refinedstorage.apiimpl.autocrafting.task;
+package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task;
 
+import com.raoulvdberge.refinedstorage.RSUtils;
+import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
+import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement;
+import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement;
+import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask;
+import com.raoulvdberge.refinedstorage.api.autocrafting.task.IProcessable;
+import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
+import com.raoulvdberge.refinedstorage.api.util.IComparer;
+import com.raoulvdberge.refinedstorage.api.util.IFluidStackList;
+import com.raoulvdberge.refinedstorage.api.util.IItemStackList;
+import com.raoulvdberge.refinedstorage.apiimpl.API;
+import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementError;
+import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementFluidRender;
+import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementItemRender;
+import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementText;
+import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementFluidStack;
+import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementItemStack;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.ItemHandlerHelper;
-import refinedstorage.RSUtils;
-import refinedstorage.api.autocrafting.ICraftingPattern;
-import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement;
-import refinedstorage.api.autocrafting.preview.ICraftingPreviewElement;
-import refinedstorage.api.autocrafting.task.ICraftingTask;
-import refinedstorage.api.autocrafting.task.IProcessable;
-import refinedstorage.api.network.INetworkMaster;
-import refinedstorage.api.util.IComparer;
-import refinedstorage.api.util.IFluidStackList;
-import refinedstorage.api.util.IItemStackList;
-import refinedstorage.apiimpl.API;
-import refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementError;
-import refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementFluidRender;
-import refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementItemRender;
-import refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementText;
-import refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementFluidStack;
-import refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementItemStack;
 
 import javax.annotation.Nullable;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 public class CraftingTask implements ICraftingTask {
     private static final int DEFAULT_COMPARE = IComparer.COMPARE_DAMAGE | IComparer.COMPARE_NBT;
@@ -64,7 +63,7 @@ public class CraftingTask implements ICraftingTask {
         this.quantity = quantity;
     }
 
-    public CraftingTask(INetworkMaster network, @Nullable ItemStack requested, ICraftingPattern pattern, int quantity, List<IProcessable> toProcess, IItemStackList toTake, IItemStackList internalToTake,  IFluidStackList toTakeFluids, Deque<ItemStack> toInsert, IItemStackList took, List<FluidStack> tookFluids) {
+    public CraftingTask(INetworkMaster network, @Nullable ItemStack requested, ICraftingPattern pattern, int quantity, List<IProcessable> toProcess, IItemStackList toTake, IItemStackList internalToTake, IFluidStackList toTakeFluids, Deque<ItemStack> toInsert, IItemStackList took, List<FluidStack> tookFluids) {
         this(network, requested, pattern, quantity);
 
         this.toProcess = toProcess;

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/Processable.java

@@ -1,14 +1,14 @@
-package refinedstorage.apiimpl.autocrafting.task;
+package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task;
 
+import com.raoulvdberge.refinedstorage.RSUtils;
+import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
+import com.raoulvdberge.refinedstorage.api.autocrafting.task.IProcessable;
+import com.raoulvdberge.refinedstorage.api.util.IComparer;
+import com.raoulvdberge.refinedstorage.api.util.IItemStackList;
+import com.raoulvdberge.refinedstorage.apiimpl.API;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.Constants;
-import refinedstorage.RSUtils;
-import refinedstorage.api.autocrafting.ICraftingPattern;
-import refinedstorage.api.autocrafting.task.IProcessable;
-import refinedstorage.api.util.IComparer;
-import refinedstorage.api.util.IItemStackList;
-import refinedstorage.apiimpl.API;
 
 public class Processable implements IProcessable {
     private static final String NBT_SATISFIED = "Satisfied_%d";

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java

@@ -1,17 +1,17 @@
-package refinedstorage.apiimpl.network;
+package com.raoulvdberge.refinedstorage.apiimpl.network;
 
+import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternContainer;
+import com.raoulvdberge.refinedstorage.api.network.INetworkNode;
+import com.raoulvdberge.refinedstorage.api.network.INetworkNodeGraph;
+import com.raoulvdberge.refinedstorage.api.storage.fluid.IFluidStorageProvider;
+import com.raoulvdberge.refinedstorage.api.storage.item.IItemStorageProvider;
+import com.raoulvdberge.refinedstorage.tile.TileController;
+import com.raoulvdberge.refinedstorage.tile.TileNetworkTransmitter;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.DimensionManager;
-import refinedstorage.api.autocrafting.ICraftingPatternContainer;
-import refinedstorage.api.network.INetworkNode;
-import refinedstorage.api.network.INetworkNodeGraph;
-import refinedstorage.api.storage.fluid.IFluidStorageProvider;
-import refinedstorage.api.storage.item.IItemStorageProvider;
-import refinedstorage.tile.TileController;
-import refinedstorage.tile.TileNetworkTransmitter;
 
 import java.util.*;
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/WirelessGridConsumer.java

@@ -1,8 +1,8 @@
-package refinedstorage.apiimpl.network;
+package com.raoulvdberge.refinedstorage.apiimpl.network;
 
+import com.raoulvdberge.refinedstorage.api.network.IWirelessGridConsumer;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import refinedstorage.api.network.IWirelessGridConsumer;
 
 public class WirelessGridConsumer implements IWirelessGridConsumer {
     private EntityPlayer player;

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

@@ -1,15 +1,15 @@
-package refinedstorage.apiimpl.network;
+package com.raoulvdberge.refinedstorage.apiimpl.network;
 
+import com.raoulvdberge.refinedstorage.RS;
+import com.raoulvdberge.refinedstorage.RSGui;
+import com.raoulvdberge.refinedstorage.RSItems;
+import com.raoulvdberge.refinedstorage.api.network.*;
+import com.raoulvdberge.refinedstorage.item.ItemWirelessGrid;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumHand;
 import net.minecraft.world.World;
-import refinedstorage.RS;
-import refinedstorage.RSGui;
-import refinedstorage.RSItems;
-import refinedstorage.api.network.*;
-import refinedstorage.item.ItemWirelessGrid;
 
 import java.util.ArrayList;
 import java.util.Iterator;

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/FluidGridHandler.java

@@ -1,15 +1,15 @@
-package refinedstorage.apiimpl.network.grid;
+package com.raoulvdberge.refinedstorage.apiimpl.network.grid;
 
+import com.raoulvdberge.refinedstorage.RSUtils;
+import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
+import com.raoulvdberge.refinedstorage.api.network.grid.IFluidGridHandler;
+import com.raoulvdberge.refinedstorage.apiimpl.API;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.inventory.InventoryHelper;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
-import refinedstorage.RSUtils;
-import refinedstorage.api.network.INetworkMaster;
-import refinedstorage.api.network.grid.IFluidGridHandler;
-import refinedstorage.apiimpl.API;
 
 import javax.annotation.Nullable;
 

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

@@ -1,18 +1,17 @@
-package refinedstorage.apiimpl.network.grid;
+package com.raoulvdberge.refinedstorage.apiimpl.network.grid;
 
+import com.raoulvdberge.refinedstorage.RS;
+import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask;
+import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
+import com.raoulvdberge.refinedstorage.api.network.grid.IItemGridHandler;
+import com.raoulvdberge.refinedstorage.apiimpl.API;
+import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingTask;
+import com.raoulvdberge.refinedstorage.network.MessageGridCraftingPreviewResponse;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.ItemHandlerHelper;
-import refinedstorage.RS;
-import refinedstorage.api.autocrafting.ICraftingPattern;
-import refinedstorage.api.autocrafting.task.ICraftingTask;
-import refinedstorage.api.network.INetworkMaster;
-import refinedstorage.api.network.grid.IItemGridHandler;
-import refinedstorage.apiimpl.API;
-import refinedstorage.apiimpl.autocrafting.task.CraftingTask;
-import refinedstorage.network.MessageGridCraftingPreviewResponse;
 
 public class ItemGridHandler implements IItemGridHandler {
     private INetworkMaster network;

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

@@ -1,12 +1,12 @@
-package refinedstorage.apiimpl.solderer;
+package com.raoulvdberge.refinedstorage.apiimpl.solderer;
 
+import com.raoulvdberge.refinedstorage.RSBlocks;
+import com.raoulvdberge.refinedstorage.RSItems;
+import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRecipe;
+import com.raoulvdberge.refinedstorage.block.EnumFluidStorageType;
+import com.raoulvdberge.refinedstorage.item.ItemBlockFluidStorage;
+import com.raoulvdberge.refinedstorage.item.ItemProcessor;
 import net.minecraft.item.ItemStack;
-import refinedstorage.RSBlocks;
-import refinedstorage.RSItems;
-import refinedstorage.api.solderer.ISoldererRecipe;
-import refinedstorage.block.EnumFluidStorageType;
-import refinedstorage.item.ItemBlockFluidStorage;
-import refinedstorage.item.ItemProcessor;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

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

@@ -1,10 +1,10 @@
-package refinedstorage.apiimpl.solderer;
+package com.raoulvdberge.refinedstorage.apiimpl.solderer;
 
+import com.raoulvdberge.refinedstorage.RSItems;
+import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRecipe;
+import com.raoulvdberge.refinedstorage.item.ItemProcessor;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
-import refinedstorage.RSItems;
-import refinedstorage.api.solderer.ISoldererRecipe;
-import refinedstorage.item.ItemProcessor;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

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

@@ -1,10 +1,10 @@
-package refinedstorage.apiimpl.solderer;
+package com.raoulvdberge.refinedstorage.apiimpl.solderer;
 
+import com.raoulvdberge.refinedstorage.RSItems;
+import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRecipe;
+import com.raoulvdberge.refinedstorage.item.ItemProcessor;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
-import refinedstorage.RSItems;
-import refinedstorage.api.solderer.ISoldererRecipe;
-import refinedstorage.item.ItemProcessor;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

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

@@ -1,12 +1,12 @@
-package refinedstorage.apiimpl.solderer;
+package com.raoulvdberge.refinedstorage.apiimpl.solderer;
 
+import com.raoulvdberge.refinedstorage.RSBlocks;
+import com.raoulvdberge.refinedstorage.RSItems;
+import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRecipe;
+import com.raoulvdberge.refinedstorage.block.EnumItemStorageType;
+import com.raoulvdberge.refinedstorage.item.ItemBlockStorage;
+import com.raoulvdberge.refinedstorage.item.ItemProcessor;
 import net.minecraft.item.ItemStack;
-import refinedstorage.RSBlocks;
-import refinedstorage.RSItems;
-import refinedstorage.api.solderer.ISoldererRecipe;
-import refinedstorage.block.EnumItemStorageType;
-import refinedstorage.item.ItemBlockStorage;
-import refinedstorage.item.ItemProcessor;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

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

@@ -1,10 +1,10 @@
-package refinedstorage.apiimpl.solderer;
+package com.raoulvdberge.refinedstorage.apiimpl.solderer;
 
+import com.raoulvdberge.refinedstorage.RSItems;
+import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRecipe;
+import com.raoulvdberge.refinedstorage.item.ItemUpgrade;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
-import refinedstorage.RSItems;
-import refinedstorage.api.solderer.ISoldererRecipe;
-import refinedstorage.item.ItemUpgrade;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRegistry.java

@@ -1,10 +1,10 @@
-package refinedstorage.apiimpl.solderer;
+package com.raoulvdberge.refinedstorage.apiimpl.solderer;
 
+import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRecipe;
+import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRegistry;
+import com.raoulvdberge.refinedstorage.apiimpl.API;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
-import refinedstorage.api.solderer.ISoldererRecipe;
-import refinedstorage.api.solderer.ISoldererRegistry;
-import refinedstorage.apiimpl.API;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/fluid/FluidRenderer.java

@@ -1,4 +1,4 @@
-package refinedstorage.apiimpl.storage.fluid;
+package com.raoulvdberge.refinedstorage.apiimpl.storage.fluid;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/fluid/FluidStorageCache.java

@@ -1,13 +1,13 @@
-package refinedstorage.apiimpl.storage.fluid;
+package com.raoulvdberge.refinedstorage.apiimpl.storage.fluid;
 
+import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
+import com.raoulvdberge.refinedstorage.api.storage.AccessType;
+import com.raoulvdberge.refinedstorage.api.storage.fluid.IFluidStorage;
+import com.raoulvdberge.refinedstorage.api.storage.fluid.IFluidStorageCache;
+import com.raoulvdberge.refinedstorage.api.storage.fluid.IFluidStorageProvider;
+import com.raoulvdberge.refinedstorage.api.util.IFluidStackList;
+import com.raoulvdberge.refinedstorage.apiimpl.API;
 import net.minecraftforge.fluids.FluidStack;
-import refinedstorage.api.network.INetworkMaster;
-import refinedstorage.api.storage.AccessType;
-import refinedstorage.api.storage.fluid.IFluidStorage;
-import refinedstorage.api.storage.fluid.IFluidStorageCache;
-import refinedstorage.api.storage.fluid.IFluidStorageProvider;
-import refinedstorage.api.util.IFluidStackList;
-import refinedstorage.apiimpl.API;
 
 import javax.annotation.Nonnull;
 import java.util.ArrayList;

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/fluid/FluidStorageNBT.java

@@ -1,13 +1,13 @@
-package refinedstorage.apiimpl.storage.fluid;
+package com.raoulvdberge.refinedstorage.apiimpl.storage.fluid;
 
+import com.raoulvdberge.refinedstorage.RSUtils;
+import com.raoulvdberge.refinedstorage.api.storage.fluid.IFluidStorage;
+import com.raoulvdberge.refinedstorage.apiimpl.API;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.fluids.FluidStack;
-import refinedstorage.RSUtils;
-import refinedstorage.api.storage.fluid.IFluidStorage;
-import refinedstorage.apiimpl.API;
 
 import javax.annotation.Nullable;
 import java.util.ArrayList;

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/item/ItemStorageCache.java

@@ -1,14 +1,14 @@
-package refinedstorage.apiimpl.storage.item;
+package com.raoulvdberge.refinedstorage.apiimpl.storage.item;
 
+import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
+import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
+import com.raoulvdberge.refinedstorage.api.storage.AccessType;
+import com.raoulvdberge.refinedstorage.api.storage.item.IItemStorage;
+import com.raoulvdberge.refinedstorage.api.storage.item.IItemStorageCache;
+import com.raoulvdberge.refinedstorage.api.storage.item.IItemStorageProvider;
+import com.raoulvdberge.refinedstorage.api.util.IItemStackList;
+import com.raoulvdberge.refinedstorage.apiimpl.API;
 import net.minecraft.item.ItemStack;
-import refinedstorage.api.autocrafting.ICraftingPattern;
-import refinedstorage.api.network.INetworkMaster;
-import refinedstorage.api.storage.AccessType;
-import refinedstorage.api.storage.item.IItemStorage;
-import refinedstorage.api.storage.item.IItemStorageCache;
-import refinedstorage.api.storage.item.IItemStorageProvider;
-import refinedstorage.api.util.IItemStackList;
-import refinedstorage.apiimpl.API;
 
 import javax.annotation.Nonnull;
 import java.util.ArrayList;

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/item/ItemStorageNBT.java

@@ -1,13 +1,13 @@
-package refinedstorage.apiimpl.storage.item;
+package com.raoulvdberge.refinedstorage.apiimpl.storage.item;
 
+import com.raoulvdberge.refinedstorage.api.storage.item.IItemStorage;
+import com.raoulvdberge.refinedstorage.apiimpl.API;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.items.ItemHandlerHelper;
-import refinedstorage.api.storage.item.IItemStorage;
-import refinedstorage.apiimpl.API;
 
 import javax.annotation.Nullable;
 import java.util.ArrayList;

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/Comparer.java

@@ -1,10 +1,10 @@
-package refinedstorage.apiimpl.util;
+package com.raoulvdberge.refinedstorage.apiimpl.util;
 
+import com.raoulvdberge.refinedstorage.api.util.IComparer;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
 import org.apache.commons.lang3.ArrayUtils;
-import refinedstorage.api.util.IComparer;
 
 public class Comparer implements IComparer {
     @Override

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/FluidStackList.java

@@ -1,15 +1,14 @@
-package refinedstorage.apiimpl.util;
+package com.raoulvdberge.refinedstorage.apiimpl.util;
 
 import com.google.common.collect.ArrayListMultimap;
+import com.raoulvdberge.refinedstorage.api.util.IFluidStackList;
+import com.raoulvdberge.refinedstorage.apiimpl.API;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
-import refinedstorage.api.util.IFluidStackList;
-import refinedstorage.apiimpl.API;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.Collection;
-import java.util.stream.Collectors;
 
 public class FluidStackList implements IFluidStackList {
     private ArrayListMultimap<Fluid, FluidStack> stacks = ArrayListMultimap.create();

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemStackList.java

@@ -1,11 +1,11 @@
-package refinedstorage.apiimpl.util;
+package com.raoulvdberge.refinedstorage.apiimpl.util;
 
 import com.google.common.collect.ArrayListMultimap;
+import com.raoulvdberge.refinedstorage.api.util.IComparer;
+import com.raoulvdberge.refinedstorage.api.util.IItemStackList;
+import com.raoulvdberge.refinedstorage.apiimpl.API;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import refinedstorage.api.util.IComparer;
-import refinedstorage.api.util.IItemStackList;
-import refinedstorage.apiimpl.API;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -79,8 +79,8 @@ public class ItemStackList implements IItemStackList {
     @Override
     public void clean() {
         List<ItemStack> toRemove = stacks.values().stream()
-                .filter(stack -> stack.stackSize <= 0)
+            .filter(stack -> stack.stackSize <= 0)
-                .collect(Collectors.toList());
+            .collect(Collectors.toList());
         toRemove.forEach(stack -> stacks.remove(stack.getItem(), stack));
     }
 

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

@@ -1,5 +1,8 @@
-package refinedstorage.block;
+package com.raoulvdberge.refinedstorage.block;
 
+import com.raoulvdberge.refinedstorage.RS;
+import com.raoulvdberge.refinedstorage.item.ItemBlockBase;
+import com.raoulvdberge.refinedstorage.tile.TileBase;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.PropertyDirection;
@@ -15,9 +18,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.items.IItemHandler;
-import refinedstorage.RS;
-import refinedstorage.item.ItemBlockBase;
-import refinedstorage.tile.TileBase;
 
 public abstract class BlockBase extends Block {
     private static final PropertyDirection DIRECTION = PropertyDirection.create("direction");

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

@@ -1,5 +1,12 @@
-package refinedstorage.block;
+package com.raoulvdberge.refinedstorage.block;
 
+import com.raoulvdberge.refinedstorage.RS;
+import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
+import com.raoulvdberge.refinedstorage.api.network.INetworkNode;
+import com.raoulvdberge.refinedstorage.tile.TileBase;
+import com.raoulvdberge.refinedstorage.tile.TileCable;
+import com.raoulvdberge.refinedstorage.tile.TileMultipartNode;
+import com.raoulvdberge.refinedstorage.tile.TileNode;
 import mcmultipart.block.BlockCoverable;
 import mcmultipart.block.BlockMultipartContainer;
 import mcmultipart.raytrace.RayTraceUtils;
@@ -22,13 +29,6 @@ import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.items.IItemHandler;
-import refinedstorage.RS;
-import refinedstorage.api.network.INetworkMaster;
-import refinedstorage.api.network.INetworkNode;
-import refinedstorage.tile.TileBase;
-import refinedstorage.tile.TileCable;
-import refinedstorage.tile.TileMultipartNode;
-import refinedstorage.tile.TileNode;
 
 import java.util.ArrayList;
 import java.util.Collections;

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

@@ -1,5 +1,8 @@
-package refinedstorage.block;
+package com.raoulvdberge.refinedstorage.block;
 
+import com.raoulvdberge.refinedstorage.RS;
+import com.raoulvdberge.refinedstorage.RSGui;
+import com.raoulvdberge.refinedstorage.tile.TileConstructor;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -9,9 +12,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RS;
-import refinedstorage.RSGui;
-import refinedstorage.tile.TileConstructor;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,5 +1,10 @@
-package refinedstorage.block;
+package com.raoulvdberge.refinedstorage.block;
 
+import com.raoulvdberge.refinedstorage.RS;
+import com.raoulvdberge.refinedstorage.RSBlocks;
+import com.raoulvdberge.refinedstorage.RSGui;
+import com.raoulvdberge.refinedstorage.item.ItemBlockController;
+import com.raoulvdberge.refinedstorage.tile.TileController;
 import net.minecraft.block.Block;
 import net.minecraft.block.properties.PropertyEnum;
 import net.minecraft.block.properties.PropertyInteger;
@@ -17,11 +22,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import refinedstorage.RS;
-import refinedstorage.RSBlocks;
-import refinedstorage.RSGui;
-import refinedstorage.item.ItemBlockController;
-import refinedstorage.tile.TileController;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,5 +1,8 @@
-package refinedstorage.block;
+package com.raoulvdberge.refinedstorage.block;
 
+import com.raoulvdberge.refinedstorage.RS;
+import com.raoulvdberge.refinedstorage.RSGui;
+import com.raoulvdberge.refinedstorage.tile.TileCrafter;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -8,9 +11,6 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RS;
-import refinedstorage.RSGui;
-import refinedstorage.tile.TileCrafter;
 
 public class BlockCrafter extends BlockNode {
     public BlockCrafter() {

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

@@ -1,5 +1,8 @@
-package refinedstorage.block;
+package com.raoulvdberge.refinedstorage.block;
 
+import com.raoulvdberge.refinedstorage.RS;
+import com.raoulvdberge.refinedstorage.RSGui;
+import com.raoulvdberge.refinedstorage.tile.TileCraftingMonitor;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -8,9 +11,6 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RS;
-import refinedstorage.RSGui;
-import refinedstorage.tile.TileCraftingMonitor;
 
 public class BlockCraftingMonitor extends BlockNode {
     public BlockCraftingMonitor() {

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

@@ -1,5 +1,9 @@
-package refinedstorage.block;
+package com.raoulvdberge.refinedstorage.block;
 
+import com.raoulvdberge.refinedstorage.RS;
+import com.raoulvdberge.refinedstorage.RSBlocks;
+import com.raoulvdberge.refinedstorage.RSGui;
+import com.raoulvdberge.refinedstorage.tile.TileDestructor;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -9,10 +13,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RS;
-import refinedstorage.RSBlocks;
-import refinedstorage.RSGui;
-import refinedstorage.tile.TileDestructor;
 
 import java.util.List;
 

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

@@ -1,5 +1,8 @@
-package refinedstorage.block;
+package com.raoulvdberge.refinedstorage.block;
 
+import com.raoulvdberge.refinedstorage.RS;
+import com.raoulvdberge.refinedstorage.RSGui;
+import com.raoulvdberge.refinedstorage.tile.TileDetector;
 import net.minecraft.block.properties.PropertyBool;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
@@ -13,9 +16,6 @@ import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import refinedstorage.RS;
-import refinedstorage.RSGui;
-import refinedstorage.tile.TileDetector;
 
 public class BlockDetector extends BlockNode {
     private static final AxisAlignedBB AABB_DETECTOR = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 5D / 16D, 1.0D);

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

@@ -1,5 +1,8 @@
-package refinedstorage.block;
+package com.raoulvdberge.refinedstorage.block;
 
+import com.raoulvdberge.refinedstorage.RS;
+import com.raoulvdberge.refinedstorage.RSGui;
+import com.raoulvdberge.refinedstorage.tile.TileDiskDrive;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -8,9 +11,6 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RS;
-import refinedstorage.RSGui;
-import refinedstorage.tile.TileDiskDrive;
 
 public class BlockDiskDrive extends BlockNode {
     public BlockDiskDrive() {

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

@@ -1,5 +1,8 @@
-package refinedstorage.block;
+package com.raoulvdberge.refinedstorage.block;
 
+import com.raoulvdberge.refinedstorage.RS;
+import com.raoulvdberge.refinedstorage.RSGui;
+import com.raoulvdberge.refinedstorage.tile.TileDiskManipulator;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -8,9 +11,6 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RS;
-import refinedstorage.RSGui;
-import refinedstorage.tile.TileDiskManipulator;
 
 import javax.annotation.Nullable;
 

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

@@ -1,5 +1,8 @@
-package refinedstorage.block;
+package com.raoulvdberge.refinedstorage.block;
 
+import com.raoulvdberge.refinedstorage.RS;
+import com.raoulvdberge.refinedstorage.RSGui;
+import com.raoulvdberge.refinedstorage.tile.TileExporter;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -9,9 +12,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RS;
-import refinedstorage.RSGui;
-import refinedstorage.tile.TileExporter;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,5 +1,8 @@
-package refinedstorage.block;
+package com.raoulvdberge.refinedstorage.block;
 
+import com.raoulvdberge.refinedstorage.RS;
+import com.raoulvdberge.refinedstorage.RSGui;
+import com.raoulvdberge.refinedstorage.tile.externalstorage.TileExternalStorage;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
@@ -10,9 +13,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RS;
-import refinedstorage.RSGui;
-import refinedstorage.tile.externalstorage.TileExternalStorage;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,5 +1,8 @@
-package refinedstorage.block;
+package com.raoulvdberge.refinedstorage.block;
 
+import com.raoulvdberge.refinedstorage.RS;
+import com.raoulvdberge.refinedstorage.RSGui;
+import com.raoulvdberge.refinedstorage.tile.TileFluidInterface;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -8,9 +11,6 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RS;
-import refinedstorage.RSGui;
-import refinedstorage.tile.TileFluidInterface;
 
 public class BlockFluidInterface extends BlockNode {
     public BlockFluidInterface() {

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

@@ -1,5 +1,10 @@
-package refinedstorage.block;
+package com.raoulvdberge.refinedstorage.block;
 
+import com.raoulvdberge.refinedstorage.RS;
+import com.raoulvdberge.refinedstorage.RSBlocks;
+import com.raoulvdberge.refinedstorage.RSGui;
+import com.raoulvdberge.refinedstorage.item.ItemBlockFluidStorage;
+import com.raoulvdberge.refinedstorage.tile.TileFluidStorage;
 import net.minecraft.block.properties.PropertyEnum;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
@@ -15,11 +20,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import refinedstorage.RS;
-import refinedstorage.RSBlocks;
-import refinedstorage.RSGui;
-import refinedstorage.item.ItemBlockFluidStorage;
-import refinedstorage.tile.TileFluidStorage;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,5 +1,9 @@
-package refinedstorage.block;
+package com.raoulvdberge.refinedstorage.block;
 
+import com.raoulvdberge.refinedstorage.RS;
+import com.raoulvdberge.refinedstorage.RSGui;
+import com.raoulvdberge.refinedstorage.item.ItemBlockBase;
+import com.raoulvdberge.refinedstorage.tile.grid.TileGrid;
 import net.minecraft.block.properties.PropertyEnum;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
@@ -12,10 +16,6 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RS;
-import refinedstorage.RSGui;
-import refinedstorage.item.ItemBlockBase;
-import refinedstorage.tile.grid.TileGrid;
 
 import java.util.List;
 

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

@@ -1,5 +1,8 @@
-package refinedstorage.block;
+package com.raoulvdberge.refinedstorage.block;
 
+import com.raoulvdberge.refinedstorage.RS;
+import com.raoulvdberge.refinedstorage.RSGui;
+import com.raoulvdberge.refinedstorage.tile.TileImporter;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -9,9 +12,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RS;
-import refinedstorage.RSGui;
-import refinedstorage.tile.TileImporter;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,43 +1,43 @@
-package refinedstorage.block;
+package com.raoulvdberge.refinedstorage.block;
-
+
-import net.minecraft.block.state.IBlockState;
+import com.raoulvdberge.refinedstorage.RS;
-import net.minecraft.entity.player.EntityPlayer;
+import com.raoulvdberge.refinedstorage.RSGui;
-import net.minecraft.item.ItemStack;
+import com.raoulvdberge.refinedstorage.tile.TileInterface;
-import net.minecraft.tileentity.TileEntity;
+import net.minecraft.block.state.IBlockState;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.EnumHand;
+import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
+import net.minecraft.util.EnumFacing;
-import refinedstorage.RS;
+import net.minecraft.util.EnumHand;
-import refinedstorage.RSGui;
+import net.minecraft.util.math.BlockPos;
-import refinedstorage.tile.TileInterface;
+import net.minecraft.world.World;
-
+
-public class BlockInterface extends BlockNode {
+public class BlockInterface extends BlockNode {
-    public BlockInterface() {
+    public BlockInterface() {
-        super("interface");
+        super("interface");
-    }
+    }
-
+
-    @Override
+    @Override
-    public TileEntity createTileEntity(World world, IBlockState state) {
+    public TileEntity createTileEntity(World world, IBlockState state) {
-        return new TileInterface();
+        return new TileInterface();
-    }
+    }
-
+
-    @Override
+    @Override
-    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
+    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) {
+        if (!world.isRemote) {
-            player.openGui(RS.INSTANCE, RSGui.INTERFACE, world, pos.getX(), pos.getY(), pos.getZ());
+            player.openGui(RS.INSTANCE, RSGui.INTERFACE, world, pos.getX(), pos.getY(), pos.getZ());
-        }
+        }
-
+
-        return true;
+        return true;
-    }
+    }
-
+
-    @Override
+    @Override
-    public boolean hasConnectivityState() {
+    public boolean hasConnectivityState() {
-        return true;
+        return true;
-    }
+    }
-
+
-    @Override
+    @Override
-    public EnumPlacementType getPlacementType() {
+    public EnumPlacementType getPlacementType() {
-        return null;
+        return null;
-    }
+    }
-}
+}

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

@@ -1,4 +1,4 @@
-package refinedstorage.block;
+package com.raoulvdberge.refinedstorage.block;
 
 public class BlockMachineCasing extends BlockBase {
     public BlockMachineCasing() {

src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java

@@ -1,9 +1,9 @@
-package refinedstorage.block;
+package com.raoulvdberge.refinedstorage.block;
 
+import com.raoulvdberge.refinedstorage.tile.TileNetworkReceiver;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import refinedstorage.tile.TileNetworkReceiver;
 
 public class BlockNetworkReceiver extends BlockNode {
     public BlockNetworkReceiver() {

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

@@ -1,5 +1,8 @@
-package refinedstorage.block;
+package com.raoulvdberge.refinedstorage.block;
 
+import com.raoulvdberge.refinedstorage.RS;
+import com.raoulvdberge.refinedstorage.RSGui;
+import com.raoulvdberge.refinedstorage.tile.TileNetworkTransmitter;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -8,9 +11,6 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.RS;
-import refinedstorage.RSGui;
-import refinedstorage.tile.TileNetworkTransmitter;
 
 public class BlockNetworkTransmitter extends BlockNode {
     public BlockNetworkTransmitter() {

src/main/java/com/raoulvdberge/refinedstorage/block/BlockNode.java

@@ -1,5 +1,7 @@
-package refinedstorage.block;
+package com.raoulvdberge.refinedstorage.block;
 
+import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
+import com.raoulvdberge.refinedstorage.tile.TileNode;
 import net.minecraft.block.properties.PropertyBool;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
@@ -10,8 +12,6 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import refinedstorage.api.network.INetworkMaster;
-import refinedstorage.tile.TileNode;
 
 public abstract class BlockNode extends BlockBase {
     private static final PropertyBool CONNECTED = PropertyBool.create("connected");

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

@@ -1,5 +1,8 @@
-package refinedstorage.block;
+package com.raoulvdberge.refinedstorage.block;
 
+import com.raoulvdberge.refinedstorage.RS;
+import com.raoulvdberge.refinedstorage.RSGui;
+import com.raoulvdberge.refinedstorage.tile.TileProcessingPatternEncoder;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
@@ -10,9 +13,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
-import refinedstorage.RS;
-import refinedstorage.RSGui;
-import refinedstorage.tile.TileProcessingPatternEncoder;
 
 import java.util.List;
 

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

@@ -1,42 +1,42 @@
-package refinedstorage.block;
+package com.raoulvdberge.refinedstorage.block;
-
+
-import net.minecraft.block.state.IBlockState;
+import com.raoulvdberge.refinedstorage.RS;
-import net.minecraft.entity.player.EntityPlayer;
+import com.raoulvdberge.refinedstorage.RSGui;
-import net.minecraft.item.ItemStack;
+import com.raoulvdberge.refinedstorage.tile.TileRelay;
-import net.minecraft.tileentity.TileEntity;
+import net.minecraft.block.state.IBlockState;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.EnumHand;
+import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
+import net.minecraft.util.EnumFacing;
-import refinedstorage.RS;
+import net.minecraft.util.EnumHand;
-import refinedstorage.RSGui;
+import net.minecraft.util.math.BlockPos;
-import refinedstorage.tile.TileRelay;
+import net.minecraft.world.World;
-
+
-public class BlockRelay extends BlockNode {
+public class BlockRelay extends BlockNode {
-    public BlockRelay() {
+    public BlockRelay() {
-        super("relay");
+        super("relay");
-    }
+    }
-
+
-    @Override
+    @Override
-    public TileEntity createTileEntity(World world, IBlockState state) {
+    public TileEntity createTileEntity(World world, IBlockState state) {
-        return new TileRelay();
+        return new TileRelay();
-    }
+    }
-
+
-    @Override
+    @Override
-    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
+    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) {
+        if (!world.isRemote) {
-            player.openGui(RS.INSTANCE, RSGui.RELAY, world, pos.getX(), pos.getY(), pos.getZ());
+            player.openGui(RS.INSTANCE, RSGui.RELAY, world, pos.getX(), pos.getY(), pos.getZ());
-        }
+        }
-
+
-        return true;
+        return true;
-    }
+    }
-
+
-    @Override
+    @Override
-    public EnumPlacementType getPlacementType() {
+    public EnumPlacementType getPlacementType() {
-        return null;
+        return null;
-    }
+    }
-
+
-    public boolean hasConnectivityState() {
+    public boolean hasConnectivityState() {
-        return true;
+        return true;
-    }
+    }
-}
+}

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

@@ -1,5 +1,8 @@
-package refinedstorage.block;
+package com.raoulvdberge.refinedstorage.block;
 
+import com.raoulvdberge.refinedstorage.RS;
+import com.raoulvdberge.refinedstorage.RSGui;
+import com.raoulvdberge.refinedstorage.tile.TileSolderer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
@@ -10,9 +13,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
-import refinedstorage.RS;
-import refinedstorage.RSGui;
-import refinedstorage.tile.TileSolderer;
 
 import java.util.List;
 

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

@@ -1,114 +1,114 @@
-package refinedstorage.block;
+package com.raoulvdberge.refinedstorage.block;
-
+
-import net.minecraft.block.properties.PropertyEnum;
+import com.raoulvdberge.refinedstorage.RS;
-import net.minecraft.block.state.BlockStateContainer;
+import com.raoulvdberge.refinedstorage.RSBlocks;
-import net.minecraft.block.state.IBlockState;
+import com.raoulvdberge.refinedstorage.RSGui;
-import net.minecraft.creativetab.CreativeTabs;
+import com.raoulvdberge.refinedstorage.item.ItemBlockStorage;
-import net.minecraft.entity.EntityLivingBase;
+import com.raoulvdberge.refinedstorage.tile.TileStorage;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.block.properties.PropertyEnum;
-import net.minecraft.item.Item;
+import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.item.ItemStack;
+import net.minecraft.block.state.IBlockState;
-import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.tileentity.TileEntity;
+import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.EnumHand;
+import net.minecraft.item.Item;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.item.ItemStack;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
+import net.minecraft.tileentity.TileEntity;
-import refinedstorage.RS;
+import net.minecraft.util.EnumFacing;
-import refinedstorage.RSBlocks;
+import net.minecraft.util.EnumHand;
-import refinedstorage.RSGui;
+import net.minecraft.util.math.BlockPos;
-import refinedstorage.item.ItemBlockStorage;
+import net.minecraft.world.IBlockAccess;
-import refinedstorage.tile.TileStorage;
+import net.minecraft.world.World;
-
+
-import java.util.ArrayList;
+import java.util.ArrayList;
-import java.util.List;
+import java.util.List;
-
+
-public class BlockStorage extends BlockNode {
+public class BlockStorage extends BlockNode {
-    public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumItemStorageType.class);
+    public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumItemStorageType.class);
-
+
-    public BlockStorage() {
+    public BlockStorage() {
-        super("storage");
+        super("storage");
-
+
-        setHardness(5.8F);
+        setHardness(5.8F);
-    }
+    }
-
+
-    @Override
+    @Override
-    public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> subItems) {
+    public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> subItems) {
-        for (int i = 0; i <= 4; ++i) {
+        for (int i = 0; i <= 4; ++i) {
-            subItems.add(ItemBlockStorage.initNBT(new ItemStack(item, 1, i)));
+            subItems.add(ItemBlockStorage.initNBT(new ItemStack(item, 1, i)));
-        }
+        }
-    }
+    }
-
+
-    @Override
+    @Override
-    protected BlockStateContainer createBlockState() {
+    protected BlockStateContainer createBlockState() {
-        return createBlockStateBuilder()
+        return createBlockStateBuilder()
-            .add(TYPE)
+            .add(TYPE)
-            .build();
+            .build();
-    }
+    }
-
+
-    @Override
+    @Override
-    public IBlockState getStateFromMeta(int meta) {
+    public IBlockState getStateFromMeta(int meta) {
-        return getDefaultState().withProperty(TYPE, EnumItemStorageType.getById(meta));
+        return getDefaultState().withProperty(TYPE, EnumItemStorageType.getById(meta));
-    }
+    }
-
+
-    @Override
+    @Override
-    public int getMetaFromState(IBlockState state) {
+    public int getMetaFromState(IBlockState state) {
-        return ((EnumItemStorageType) state.getValue(TYPE)).getId();
+        return ((EnumItemStorageType) state.getValue(TYPE)).getId();
-    }
+    }
-
+
-    @Override
+    @Override
-    public TileEntity createTileEntity(World world, IBlockState state) {
+    public TileEntity createTileEntity(World world, IBlockState state) {
-        return new TileStorage();
+        return new TileStorage();
-    }
+    }
-
+
-    @Override
+    @Override
-    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
+    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) {
+        if (!world.isRemote) {
-            player.openGui(RS.INSTANCE, RSGui.STORAGE, world, pos.getX(), pos.getY(), pos.getZ());
+            player.openGui(RS.INSTANCE, RSGui.STORAGE, world, pos.getX(), pos.getY(), pos.getZ());
-        }
+        }
-
+
-        return true;
+        return true;
-    }
+    }
-
+
-    @Override
+    @Override
-    public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack) {
+    public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack) {
-        super.onBlockPlacedBy(world, pos, state, player, stack);
+        super.onBlockPlacedBy(world, pos, state, player, stack);
-
+
-        if (!world.isRemote && stack.hasTagCompound() && stack.getTagCompound().hasKey(TileStorage.NBT_STORAGE)) {
+        if (!world.isRemote && stack.hasTagCompound() && stack.getTagCompound().hasKey(TileStorage.NBT_STORAGE)) {
-            ((TileStorage) world.getTileEntity(pos)).setStorageTag(stack.getTagCompound().getCompoundTag(TileStorage.NBT_STORAGE));
+            ((TileStorage) world.getTileEntity(pos)).setStorageTag(stack.getTagCompound().getCompoundTag(TileStorage.NBT_STORAGE));
-        }
+        }
-    }
+    }
-
+
-    @Override
+    @Override
-    public void breakBlock(World world, BlockPos pos, IBlockState state) {
+    public void breakBlock(World world, BlockPos pos, IBlockState state) {
-        ((TileStorage) world.getTileEntity(pos)).onBreak();
+        ((TileStorage) world.getTileEntity(pos)).onBreak();
-
+
-        super.breakBlock(world, pos, state);
+        super.breakBlock(world, pos, state);
-    }
+    }
-
+
-    @Override
+    @Override
-    public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
+    public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
-        TileStorage storage = (TileStorage) world.getTileEntity(pos);
+        TileStorage storage = (TileStorage) world.getTileEntity(pos);
-
+
-        List<ItemStack> drops = new ArrayList<>();
+        List<ItemStack> drops = new ArrayList<>();
-
+
-        ItemStack stack = new ItemStack(RSBlocks.STORAGE, 1, getMetaFromState(state));
+        ItemStack stack = new ItemStack(RSBlocks.STORAGE, 1, getMetaFromState(state));
-        stack.setTagCompound(new NBTTagCompound());
+        stack.setTagCompound(new NBTTagCompound());
-        stack.getTagCompound().setTag(TileStorage.NBT_STORAGE, storage.getStorageTag());
+        stack.getTagCompound().setTag(TileStorage.NBT_STORAGE, storage.getStorageTag());
-
+
-        drops.add(stack);
+        drops.add(stack);
-
+
-        return drops;
+        return drops;
-    }
+    }
-
+
-    @Override
+    @Override
-    public Item createItem() {
+    public Item createItem() {
-        return new ItemBlockStorage();
+        return new ItemBlockStorage();
-    }
+    }
-
+
-    @Override
+    @Override
-    public EnumPlacementType getPlacementType() {
+    public EnumPlacementType getPlacementType() {
-        return null;
+        return null;
-    }
+    }
-}
+}