Update package name

build.gradle

@@ -27,7 +27,7 @@ def env = System.getenv()
 if (env.BUILD_NUMBER) {
     version = version + "+" + "${env.BUILD_NUMBER}"
 }
-group = 'com.raoulvdberge'
+group = 'com.refinedmods'
 archivesBaseName = 'refinedstorage'
 
 sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
@@ -108,11 +108,11 @@ jar {
     manifest {
         attributes([
                 "Specification-Title"     : "refinedstorage",
-                "Specification-Vendor"    : "raoulvdberge",
+                "Specification-Vendor"    : "refinedmods",
                 "Specification-Version"   : "1",
                 "Implementation-Title"    : project.name,
                 "Implementation-Version"  : "${version}",
-                "Implementation-Vendor"   : "raoulvdberge",
+                "Implementation-Vendor"   : "refinedmods",
                 "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
         ])
     }
@@ -123,7 +123,7 @@ jar.finalizedBy('reobfJar')
 task apiJar(type: Jar, dependsOn: 'classes') {
     classifier = 'api'
     from(sourceSets.main.output) {
-        include 'com/raoulvdberge/refinedstorage/api/**'
+        include 'com/refinedmods/refinedstorage/api/**'
     }
 }
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTaskFactory.java

@@ -1,28 +0,0 @@
-package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v5;
-
-import com.raoulvdberge.refinedstorage.RS;
-import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
-import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadException;
-import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingRequestInfo;
-import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask;
-import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskFactory;
-import com.raoulvdberge.refinedstorage.api.network.INetwork;
-import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.ResourceLocation;
-
-import javax.annotation.Nonnull;
-
-public class CraftingTaskFactory implements ICraftingTaskFactory {
-    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "v5");
-
-    @Nonnull
-    @Override
-    public ICraftingTask create(INetwork network, ICraftingRequestInfo requested, int quantity, ICraftingPattern pattern) {
-        return new com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v5.CraftingTask(network, requested, quantity, pattern);
-    }
-
-    @Override
-    public ICraftingTask createFromNbt(INetwork network, CompoundNBT tag) throws CraftingTaskReadException {
-        return new com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v5.CraftingTask(network, tag);
-    }
-}

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTaskFactory.java

@@ -1,28 +0,0 @@
-package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v6;
-
-import com.raoulvdberge.refinedstorage.RS;
-import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
-import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadException;
-import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingRequestInfo;
-import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask;
-import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskFactory;
-import com.raoulvdberge.refinedstorage.api.network.INetwork;
-import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.ResourceLocation;
-
-import javax.annotation.Nonnull;
-
-public class CraftingTaskFactory implements ICraftingTaskFactory {
-    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "v6");
-
-    @Nonnull
-    @Override
-    public ICraftingTask create(INetwork network, ICraftingRequestInfo requested, int quantity, ICraftingPattern pattern) {
-        return new com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v6.CraftingTask(network, requested, quantity, pattern);
-    }
-
-    @Override
-    public ICraftingTask createFromNbt(INetwork network, CompoundNBT tag) throws CraftingTaskReadException {
-        return new com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v6.CraftingTask(network, tag);
-    }
-}

src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/IGridSorter.java

@@ -1,10 +0,0 @@
-package com.raoulvdberge.refinedstorage.screen.grid.sorting;
-
-import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
-import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
-
-public interface IGridSorter {
-    boolean isApplicable(IGrid grid);
-
-    int compare(IGridStack left, IGridStack right, SortingDirection direction);
-}

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

@@ -1,13 +1,13 @@
-package com.raoulvdberge.refinedstorage;
+package com.refinedmods.refinedstorage;
 
-import com.raoulvdberge.refinedstorage.apiimpl.API;
-import com.raoulvdberge.refinedstorage.config.ClientConfig;
-import com.raoulvdberge.refinedstorage.config.ServerConfig;
-import com.raoulvdberge.refinedstorage.item.group.MainItemGroup;
-import com.raoulvdberge.refinedstorage.network.NetworkHandler;
-import com.raoulvdberge.refinedstorage.setup.ClientSetup;
-import com.raoulvdberge.refinedstorage.setup.CommonSetup;
-import com.raoulvdberge.refinedstorage.setup.ServerSetup;
+import com.refinedmods.refinedstorage.apiimpl.API;
+import com.refinedmods.refinedstorage.config.ClientConfig;
+import com.refinedmods.refinedstorage.config.ServerConfig;
+import com.refinedmods.refinedstorage.item.group.MainItemGroup;
+import com.refinedmods.refinedstorage.network.NetworkHandler;
+import com.refinedmods.refinedstorage.setup.ClientSetup;
+import com.refinedmods.refinedstorage.setup.CommonSetup;
+import com.refinedmods.refinedstorage.setup.ServerSetup;
 import net.minecraft.block.Block;
 import net.minecraft.inventory.container.ContainerType;
 import net.minecraft.item.Item;

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

@@ -1,6 +1,6 @@
-package com.raoulvdberge.refinedstorage;
+package com.refinedmods.refinedstorage;
 
-import com.raoulvdberge.refinedstorage.block.*;
+import com.refinedmods.refinedstorage.block.*;
 import net.minecraftforge.registries.ObjectHolder;
 
 public final class RSBlocks {

src/main/java/com/refinedmods/refinedstorage/RSContainers.java

@@ -1,6 +1,6 @@
-package com.raoulvdberge.refinedstorage;
+package com.refinedmods.refinedstorage;
 
-import com.raoulvdberge.refinedstorage.container.*;
+import com.refinedmods.refinedstorage.container.*;
 import net.minecraft.inventory.container.ContainerType;
 import net.minecraftforge.registries.ObjectHolder;
 

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

@@ -1,7 +1,7 @@
-package com.raoulvdberge.refinedstorage;
+package com.refinedmods.refinedstorage;
 
-import com.raoulvdberge.refinedstorage.item.*;
-import com.raoulvdberge.refinedstorage.item.blockitem.PortableGridBlockItem;
+import com.refinedmods.refinedstorage.item.*;
+import com.refinedmods.refinedstorage.item.blockitem.PortableGridBlockItem;
 import net.minecraftforge.registries.ObjectHolder;
 
 public final class RSItems {

src/main/java/com/refinedmods/refinedstorage/RSKeyBindings.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage;
+package com.refinedmods.refinedstorage;
 
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.client.util.InputMappings;

src/main/java/com/refinedmods/refinedstorage/RSTiles.java

@@ -1,9 +1,9 @@
-package com.raoulvdberge.refinedstorage;
+package com.refinedmods.refinedstorage;
 
-import com.raoulvdberge.refinedstorage.tile.*;
-import com.raoulvdberge.refinedstorage.tile.craftingmonitor.CraftingMonitorTile;
-import com.raoulvdberge.refinedstorage.tile.grid.GridTile;
-import com.raoulvdberge.refinedstorage.tile.grid.portable.PortableGridTile;
+import com.refinedmods.refinedstorage.tile.*;
+import com.refinedmods.refinedstorage.tile.craftingmonitor.CraftingMonitorTile;
+import com.refinedmods.refinedstorage.tile.grid.GridTile;
+import com.refinedmods.refinedstorage.tile.grid.portable.PortableGridTile;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraftforge.registries.ObjectHolder;
 

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

@@ -1,27 +1,27 @@
-package com.raoulvdberge.refinedstorage.api;
+package com.refinedmods.refinedstorage.api;
 
-import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternRenderHandler;
-import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementList;
-import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry;
-import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry;
-import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadException;
-import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingRequestInfo;
-import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskRegistry;
-import com.raoulvdberge.refinedstorage.api.network.INetworkManager;
-import com.raoulvdberge.refinedstorage.api.network.grid.ICraftingGridBehavior;
-import com.raoulvdberge.refinedstorage.api.network.grid.IGridManager;
-import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode;
-import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeManager;
-import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeRegistry;
-import com.raoulvdberge.refinedstorage.api.storage.StorageType;
-import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk;
-import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskManager;
-import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskRegistry;
-import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskSync;
-import com.raoulvdberge.refinedstorage.api.storage.externalstorage.IExternalStorageProvider;
-import com.raoulvdberge.refinedstorage.api.util.IComparer;
-import com.raoulvdberge.refinedstorage.api.util.IQuantityFormatter;
-import com.raoulvdberge.refinedstorage.api.util.IStackList;
+import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternRenderHandler;
+import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementList;
+import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry;
+import com.refinedmods.refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry;
+import com.refinedmods.refinedstorage.api.autocrafting.task.CraftingTaskReadException;
+import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingRequestInfo;
+import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTaskRegistry;
+import com.refinedmods.refinedstorage.api.network.INetworkManager;
+import com.refinedmods.refinedstorage.api.network.grid.ICraftingGridBehavior;
+import com.refinedmods.refinedstorage.api.network.grid.IGridManager;
+import com.refinedmods.refinedstorage.api.network.node.INetworkNode;
+import com.refinedmods.refinedstorage.api.network.node.INetworkNodeManager;
+import com.refinedmods.refinedstorage.api.network.node.INetworkNodeRegistry;
+import com.refinedmods.refinedstorage.api.storage.StorageType;
+import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk;
+import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskManager;
+import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskRegistry;
+import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskSync;
+import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorageProvider;
+import com.refinedmods.refinedstorage.api.util.IComparer;
+import com.refinedmods.refinedstorage.api.util.IQuantityFormatter;
+import com.refinedmods.refinedstorage.api.util.IStackList;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.world.server.ServerWorld;

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

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

src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingManager.java

@@ -1,7 +1,7 @@
-package com.raoulvdberge.refinedstorage.api.autocrafting;
+package com.refinedmods.refinedstorage.api.autocrafting;
 
-import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorListener;
-import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask;
+import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorListener;
+import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTask;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.util.text.ITextComponent;

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

@@ -1,6 +1,6 @@
-package com.raoulvdberge.refinedstorage.api.autocrafting;
+package com.refinedmods.refinedstorage.api.autocrafting;
 
-import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskRegistry;
+import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTaskRegistry;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.ResourceLocation;

src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternChain.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.autocrafting;
+package com.refinedmods.refinedstorage.api.autocrafting;
 
 /**
  * A crafting pattern chain, which stores equivalent patterns.

src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternChainList.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.autocrafting;
+package com.refinedmods.refinedstorage.api.autocrafting;
 
 /**
  * A list of pattern chains per pattern.

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

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

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

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

src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternRenderHandler.java

@@ -1,10 +1,11 @@
-package com.raoulvdberge.refinedstorage.api.autocrafting;
+package com.refinedmods.refinedstorage.api.autocrafting;
 
+import com.refinedmods.refinedstorage.api.IRSAPI;
 import net.minecraft.item.ItemStack;
 
 /**
  * Defines the behavior of pattern rendering.
- * One can add this interface through {@link com.raoulvdberge.refinedstorage.api.IRSAPI#addPatternRenderHandler(ICraftingPatternRenderHandler)}.
+ * One can add this interface through {@link IRSAPI#addPatternRenderHandler(ICraftingPatternRenderHandler)}.
  */
 public interface ICraftingPatternRenderHandler {
     /**

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

@@ -1,7 +1,7 @@
-package com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor;
+package com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor;
 
-import com.raoulvdberge.refinedstorage.api.render.IElementDrawers;
-import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementList;
+import com.refinedmods.refinedstorage.api.render.IElementDrawers;
+import com.refinedmods.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementList;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.api.distmarker.Dist;

src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementList.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor;
+package com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor;
 
 import java.util.List;
 

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

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor;
+package com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor;
 
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.ResourceLocation;

src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorListener.java

@@ -1,6 +1,6 @@
-package com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor;
+package com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor;
 
-import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingManager;
+import com.refinedmods.refinedstorage.api.autocrafting.ICraftingManager;
 
 /**
  * Add this listener to a {@link ICraftingManager} to listen to crafting task changes.

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

@@ -1,6 +1,6 @@
-package com.raoulvdberge.refinedstorage.api.autocrafting.preview;
+package com.refinedmods.refinedstorage.api.autocrafting.preview;
 
-import com.raoulvdberge.refinedstorage.api.render.IElementDrawers;
+import com.refinedmods.refinedstorage.api.render.IElementDrawers;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.api.distmarker.Dist;

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

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.autocrafting.preview;
+package com.refinedmods.refinedstorage.api.autocrafting.preview;
 
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.ResourceLocation;

src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/CraftingTaskErrorType.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.autocrafting.task;
+package com.refinedmods.refinedstorage.api.autocrafting.task;
 
 /**
  * The error type.

src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/CraftingTaskReadException.java

@@ -1,6 +1,6 @@
-package com.raoulvdberge.refinedstorage.api.autocrafting.task;
+package com.refinedmods.refinedstorage.api.autocrafting.task;
 
-import com.raoulvdberge.refinedstorage.api.network.INetwork;
+import com.refinedmods.refinedstorage.api.network.INetwork;
 
 /**
  * Gets thrown from {@link ICraftingTaskFactory#createFromNbt(INetwork, net.minecraft.nbt.CompoundNBT)}.

src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ICraftingRequestInfo.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.autocrafting.task;
+package com.refinedmods.refinedstorage.api.autocrafting.task;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;

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

@@ -1,9 +1,10 @@
-package com.raoulvdberge.refinedstorage.api.autocrafting.task;
+package com.refinedmods.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 com.raoulvdberge.refinedstorage.api.util.IStackList;
+import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern;
+import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement;
+import com.refinedmods.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement;
+import com.refinedmods.refinedstorage.api.network.INetwork;
+import com.refinedmods.refinedstorage.api.util.IStackList;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraftforge.fluids.FluidStack;
@@ -55,14 +56,14 @@ public interface ICraftingTask {
     ICraftingRequestInfo getRequested();
 
     /**
-     * Called when a stack is inserted into the system through {@link com.raoulvdberge.refinedstorage.api.network.INetwork#insertItemTracked(ItemStack, int)}.
+     * Called when a stack is inserted into the system through {@link INetwork#insertItemTracked(ItemStack, int)}.
      *
      * @param stack the stack
      */
     int onTrackedInsert(ItemStack stack, int size);
 
     /**
-     * Called when a stack is inserted into the system through {@link com.raoulvdberge.refinedstorage.api.network.INetwork#insertFluidTracked(FluidStack, int)}.
+     * Called when a stack is inserted into the system through {@link INetwork#insertFluidTracked(FluidStack, int)}.
      *
      * @param stack the stack
      */

src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ICraftingTaskError.java

@@ -1,6 +1,6 @@
-package com.raoulvdberge.refinedstorage.api.autocrafting.task;
+package com.refinedmods.refinedstorage.api.autocrafting.task;
 
-import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
+import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern;
 
 import javax.annotation.Nullable;
 

src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ICraftingTaskFactory.java

@@ -1,7 +1,7 @@
-package com.raoulvdberge.refinedstorage.api.autocrafting.task;
+package com.refinedmods.refinedstorage.api.autocrafting.task;
 
-import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
-import com.raoulvdberge.refinedstorage.api.network.INetwork;
+import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern;
+import com.refinedmods.refinedstorage.api.network.INetwork;
 import net.minecraft.nbt.CompoundNBT;
 
 import javax.annotation.Nonnull;

src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ICraftingTaskRegistry.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.autocrafting.task;
+package com.refinedmods.refinedstorage.api.autocrafting.task;
 
 import net.minecraft.util.ResourceLocation;
 

src/main/java/com/refinedmods/refinedstorage/api/network/INetwork.java

@@ -1,15 +1,15 @@
-package com.raoulvdberge.refinedstorage.api.network;
+package com.refinedmods.refinedstorage.api.network;
 
-import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingManager;
-import com.raoulvdberge.refinedstorage.api.network.grid.handler.IFluidGridHandler;
-import com.raoulvdberge.refinedstorage.api.network.grid.handler.IItemGridHandler;
-import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemManager;
-import com.raoulvdberge.refinedstorage.api.network.security.ISecurityManager;
-import com.raoulvdberge.refinedstorage.api.storage.IStorage;
-import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache;
-import com.raoulvdberge.refinedstorage.api.storage.tracker.IStorageTracker;
-import com.raoulvdberge.refinedstorage.api.util.Action;
-import com.raoulvdberge.refinedstorage.api.util.IComparer;
+import com.refinedmods.refinedstorage.api.autocrafting.ICraftingManager;
+import com.refinedmods.refinedstorage.api.network.grid.handler.IFluidGridHandler;
+import com.refinedmods.refinedstorage.api.network.grid.handler.IItemGridHandler;
+import com.refinedmods.refinedstorage.api.network.item.INetworkItemManager;
+import com.refinedmods.refinedstorage.api.network.security.ISecurityManager;
+import com.refinedmods.refinedstorage.api.storage.IStorage;
+import com.refinedmods.refinedstorage.api.storage.cache.IStorageCache;
+import com.refinedmods.refinedstorage.api.storage.tracker.IStorageTracker;
+import com.refinedmods.refinedstorage.api.util.Action;
+import com.refinedmods.refinedstorage.api.util.IComparer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.util.math.BlockPos;
@@ -85,7 +85,7 @@ public interface INetwork {
     INetworkItemManager getNetworkItemManager();
 
     /**
-     * @return the {@link IStorageCache<ItemStack>} of this network
+     * @return the {@link IStorageCache <ItemStack>} of this network
      */
     IStorageCache<ItemStack> getItemStorageCache();
 

src/main/java/com/refinedmods/refinedstorage/api/network/INetworkManager.java

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

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

@@ -1,7 +1,7 @@
-package com.raoulvdberge.refinedstorage.api.network;
+package com.refinedmods.refinedstorage.api.network;
 
-import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode;
-import com.raoulvdberge.refinedstorage.api.util.Action;
+import com.refinedmods.refinedstorage.api.network.node.INetworkNode;
+import com.refinedmods.refinedstorage.api.util.Action;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 

src/main/java/com/refinedmods/refinedstorage/api/network/INetworkNodeGraphListener.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.network;
+package com.refinedmods.refinedstorage.api.network;
 
 /**
  * A listener for the node graph.

src/main/java/com/refinedmods/refinedstorage/api/network/INetworkNodeVisitor.java

@@ -1,6 +1,6 @@
-package com.raoulvdberge.refinedstorage.api.network;
+package com.refinedmods.refinedstorage.api.network;
 
-import com.raoulvdberge.refinedstorage.api.util.Action;
+import com.refinedmods.refinedstorage.api.util.Action;
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;

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

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

src/main/java/com/refinedmods/refinedstorage/api/network/NetworkType.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.network;
+package com.refinedmods.refinedstorage.api.network;
 
 /**
  * Represents a network type.

src/main/java/com/refinedmods/refinedstorage/api/network/grid/GridFactoryType.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.network.grid;
+package com.refinedmods.refinedstorage.api.network.grid;
 
 /**
  * The type of grid factory.

src/main/java/com/refinedmods/refinedstorage/api/network/grid/GridType.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.network.grid;
+package com.refinedmods.refinedstorage.api.network.grid;
 
 import net.minecraft.util.IStringSerializable;
 

src/main/java/com/refinedmods/refinedstorage/api/network/grid/ICraftingGridBehavior.java

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

src/main/java/com/refinedmods/refinedstorage/api/network/grid/ICraftingGridListener.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.network.grid;
+package com.refinedmods.refinedstorage.api.network.grid;
 
 /**
  * A crafting listener for the grid.

src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGrid.java

@@ -1,10 +1,10 @@
-package com.raoulvdberge.refinedstorage.api.network.grid;
+package com.refinedmods.refinedstorage.api.network.grid;
 
-import com.raoulvdberge.refinedstorage.api.network.grid.handler.IFluidGridHandler;
-import com.raoulvdberge.refinedstorage.api.network.grid.handler.IItemGridHandler;
-import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache;
-import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener;
-import com.raoulvdberge.refinedstorage.api.util.IFilter;
+import com.refinedmods.refinedstorage.api.network.grid.handler.IFluidGridHandler;
+import com.refinedmods.refinedstorage.api.network.grid.handler.IItemGridHandler;
+import com.refinedmods.refinedstorage.api.storage.cache.IStorageCache;
+import com.refinedmods.refinedstorage.api.storage.cache.IStorageCacheListener;
+import com.refinedmods.refinedstorage.api.util.IFilter;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.inventory.CraftResultInventory;

src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridFactory.java

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

src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridManager.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.network.grid;
+package com.refinedmods.refinedstorage.api.network.grid;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.ServerPlayerEntity;

src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridTab.java

@@ -1,7 +1,7 @@
-package com.raoulvdberge.refinedstorage.api.network.grid;
+package com.refinedmods.refinedstorage.api.network.grid;
 
-import com.raoulvdberge.refinedstorage.api.render.IElementDrawer;
-import com.raoulvdberge.refinedstorage.api.util.IFilter;
+import com.refinedmods.refinedstorage.api.render.IElementDrawer;
+import com.refinedmods.refinedstorage.api.util.IFilter;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;

src/main/java/com/refinedmods/refinedstorage/api/network/grid/INetworkAwareGrid.java

@@ -1,6 +1,6 @@
-package com.raoulvdberge.refinedstorage.api.network.grid;
+package com.refinedmods.refinedstorage.api.network.grid;
 
-import com.raoulvdberge.refinedstorage.api.network.INetwork;
+import com.refinedmods.refinedstorage.api.network.INetwork;
 
 import javax.annotation.Nullable;
 

src/main/java/com/refinedmods/refinedstorage/api/network/grid/handler/IFluidGridHandler.java

@@ -1,5 +1,6 @@
-package com.raoulvdberge.refinedstorage.api.network.grid.handler;
+package com.refinedmods.refinedstorage.api.network.grid.handler;
 
+import com.refinedmods.refinedstorage.api.util.StackListEntry;
 import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.item.ItemStack;
 
@@ -14,7 +15,7 @@ public interface IFluidGridHandler {
      * Called when a player tries to extract a fluid from the grid.
      *
      * @param player the player that is attempting the extraction
-     * @param id     the id of the fluid we're trying to extract, this id is the id from {@link com.raoulvdberge.refinedstorage.api.util.StackListEntry}
+     * @param id     the id of the fluid we're trying to extract, this id is the id from {@link StackListEntry}
      * @param shift  true if shift click was used, false otherwise
      */
     void onExtract(ServerPlayerEntity player, UUID id, boolean shift);
@@ -40,7 +41,7 @@ public interface IFluidGridHandler {
      * Called when a player requests the crafting preview window to be opened.
      *
      * @param player    the player
-     * @param id        the id of the fluid we're trying to extract, this id is the id from {@link com.raoulvdberge.refinedstorage.api.util.StackListEntry}
+     * @param id        the id of the fluid we're trying to extract, this id is the id from {@link StackListEntry}
      * @param quantity  the amount of that item that we need a preview for
      * @param noPreview true if the crafting preview window shouldn't be shown, false otherwise
      */
@@ -50,7 +51,7 @@ public interface IFluidGridHandler {
      * Called when a player requested crafting for an item.
      *
      * @param player   the player that is requesting the crafting
-     * @param id       the id of the fluid we're trying to extract, this id is the id from {@link com.raoulvdberge.refinedstorage.api.util.StackListEntry}
+     * @param id       the id of the fluid we're trying to extract, this id is the id from {@link StackListEntry}
      * @param quantity the amount of the item that has to be crafted
      */
     void onCraftingRequested(ServerPlayerEntity player, UUID id, int quantity);

src/main/java/com/refinedmods/refinedstorage/api/network/grid/handler/IItemGridHandler.java

@@ -1,5 +1,6 @@
-package com.raoulvdberge.refinedstorage.api.network.grid.handler;
+package com.refinedmods.refinedstorage.api.network.grid.handler;
 
+import com.refinedmods.refinedstorage.api.util.StackListEntry;
 import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.item.ItemStack;
 
@@ -19,7 +20,7 @@ public interface IItemGridHandler {
      * Called when a player tries to extract an item from the grid.
      *
      * @param player the player that is attempting the extraction
-     * @param id     the id of the item we're trying to extract, this id is the id from {@link com.raoulvdberge.refinedstorage.api.util.StackListEntry}
+     * @param id     the id of the item we're trying to extract, this id is the id from {@link StackListEntry}
      * @param flags  how we are extracting, see the flags in {@link IItemGridHandler}
      */
     void onExtract(ServerPlayerEntity player, UUID id, int flags);
@@ -46,7 +47,7 @@ public interface IItemGridHandler {
      * Called when a player requests the crafting preview window to be opened.
      *
      * @param player    the player
-     * @param id        the id of the item we're trying to extract, this id is the id from {@link com.raoulvdberge.refinedstorage.api.util.StackListEntry}
+     * @param id        the id of the item we're trying to extract, this id is the id from {@link StackListEntry}
      * @param quantity  the amount of that item that we need a preview for
      * @param noPreview true if the crafting preview window shouldn't be shown, false otherwise
      */
@@ -56,7 +57,7 @@ public interface IItemGridHandler {
      * Called when a player requested crafting for an item.
      *
      * @param player   the player that is requesting the crafting
-     * @param id       the id of the item we're trying to extract, this id is the id from {@link com.raoulvdberge.refinedstorage.api.util.StackListEntry}
+     * @param id       the id of the item we're trying to extract, this id is the id from {@link StackListEntry}
      * @param quantity the amount of the item that has to be crafted
      */
     void onCraftingRequested(ServerPlayerEntity player, UUID id, int quantity);

src/main/java/com/refinedmods/refinedstorage/api/network/item/INetworkItem.java

@@ -1,6 +1,6 @@
-package com.raoulvdberge.refinedstorage.api.network.item;
+package com.refinedmods.refinedstorage.api.network.item;
 
-import com.raoulvdberge.refinedstorage.api.network.INetwork;
+import com.refinedmods.refinedstorage.api.network.INetwork;
 import net.minecraft.entity.player.PlayerEntity;
 
 /**

src/main/java/com/refinedmods/refinedstorage/api/network/item/INetworkItemManager.java

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

src/main/java/com/refinedmods/refinedstorage/api/network/item/INetworkItemProvider.java

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

src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNode.java

@@ -1,6 +1,6 @@
-package com.raoulvdberge.refinedstorage.api.network.node;
+package com.refinedmods.refinedstorage.api.network.node;
 
-import com.raoulvdberge.refinedstorage.api.network.INetwork;
+import com.refinedmods.refinedstorage.api.network.INetwork;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.util.ResourceLocation;

src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNodeFactory.java

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

src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNodeManager.java

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

src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNodeProxy.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.network.node;
+package com.refinedmods.refinedstorage.api.network.node;
 
 import javax.annotation.Nonnull;
 

src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNodeRegistry.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.network.node;
+package com.refinedmods.refinedstorage.api.network.node;
 
 import net.minecraft.util.ResourceLocation;
 

src/main/java/com/refinedmods/refinedstorage/api/network/security/ISecurityCard.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.network.security;
+package com.refinedmods.refinedstorage.api.network.security;
 
 import javax.annotation.Nullable;
 import java.util.UUID;

src/main/java/com/refinedmods/refinedstorage/api/network/security/ISecurityCardContainer.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.network.security;
+package com.refinedmods.refinedstorage.api.network.security;
 
 import javax.annotation.Nullable;
 import java.util.List;

src/main/java/com/refinedmods/refinedstorage/api/network/security/ISecurityManager.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.network.security;
+package com.refinedmods.refinedstorage.api.network.security;
 
 import net.minecraft.entity.player.PlayerEntity;
 

src/main/java/com/refinedmods/refinedstorage/api/network/security/Permission.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.network.security;
+package com.refinedmods.refinedstorage.api.network.security;
 
 /**
  * The various permissions a player can have in a network.

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

@@ -1,7 +1,7 @@
-package com.raoulvdberge.refinedstorage.api.render;
+package com.refinedmods.refinedstorage.api.render;
 
-import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement;
-import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement;
+import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement;
+import com.refinedmods.refinedstorage.api.autocrafting.preview.ICraftingPreviewElement;
 
 /**
  * This {@link FunctionalInterface} is used to define a draw/render function.

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

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.render;
+package com.refinedmods.refinedstorage.api.render;
 
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.item.ItemStack;

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

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

src/main/java/com/refinedmods/refinedstorage/api/storage/IStorage.java

@@ -1,7 +1,7 @@
-package com.raoulvdberge.refinedstorage.api.storage;
+package com.refinedmods.refinedstorage.api.storage;
 
-import com.raoulvdberge.refinedstorage.api.util.Action;
-import com.raoulvdberge.refinedstorage.api.util.IComparer;
+import com.refinedmods.refinedstorage.api.util.Action;
+import com.refinedmods.refinedstorage.api.util.IComparer;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

src/main/java/com/refinedmods/refinedstorage/api/storage/IStorageProvider.java

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

src/main/java/com/refinedmods/refinedstorage/api/storage/StorageType.java

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

src/main/java/com/refinedmods/refinedstorage/api/storage/cache/IStorageCache.java

@@ -1,9 +1,10 @@
-package com.raoulvdberge.refinedstorage.api.storage.cache;
+package com.refinedmods.refinedstorage.api.storage.cache;
 
-import com.raoulvdberge.refinedstorage.api.network.INetwork;
-import com.raoulvdberge.refinedstorage.api.storage.IStorage;
-import com.raoulvdberge.refinedstorage.api.storage.IStorageProvider;
-import com.raoulvdberge.refinedstorage.api.util.IStackList;
+import com.refinedmods.refinedstorage.api.network.INetwork;
+import com.refinedmods.refinedstorage.api.storage.IStorage;
+import com.refinedmods.refinedstorage.api.storage.IStorageProvider;
+import com.refinedmods.refinedstorage.api.util.Action;
+import com.refinedmods.refinedstorage.api.util.IStackList;
 
 import javax.annotation.Nonnull;
 import java.util.List;
@@ -29,7 +30,7 @@ public interface IStorageCache<T> {
      * Adds a stack to the cache.
      * <p>
      * Note that this doesn't modify any of the connected storages, but just modifies the cache.
-     * Use {@link IStorage#insert(T, int, com.raoulvdberge.refinedstorage.api.util.Action)} to add a stack to an actual storage.
+     * Use {@link IStorage#insert(T, int, Action)} to add a stack to an actual storage.
      * <p>
      * Will merge it with another stack if it already exists.
      *
@@ -44,7 +45,7 @@ public interface IStorageCache<T> {
      * Removes a stack from the cache.
      * <p>
      * Note that this doesn't modify any of the connected storages, but just modifies the cache.
-     * Use {@link IStorage#extract(T, int, int, com.raoulvdberge.refinedstorage.api.util.Action)} to remove a stack from an actual storage.
+     * Use {@link IStorage#extract(T, int, int, Action)} to remove a stack from an actual storage.
      *
      * @param stack   the stack to remove, do NOT modify
      * @param size    the size to remove

src/main/java/com/refinedmods/refinedstorage/api/storage/cache/IStorageCacheListener.java

@@ -1,6 +1,6 @@
-package com.raoulvdberge.refinedstorage.api.storage.cache;
+package com.refinedmods.refinedstorage.api.storage.cache;
 
-import com.raoulvdberge.refinedstorage.api.util.StackListResult;
+import com.refinedmods.refinedstorage.api.util.StackListResult;
 
 import java.util.List;
 

src/main/java/com/refinedmods/refinedstorage/api/storage/cache/InvalidateCause.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.storage.cache;
+package com.refinedmods.refinedstorage.api.storage.cache;
 
 public enum InvalidateCause {
     UNKNOWN,

src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDisk.java

@@ -1,6 +1,6 @@
-package com.raoulvdberge.refinedstorage.api.storage.disk;
+package com.refinedmods.refinedstorage.api.storage.disk;
 
-import com.raoulvdberge.refinedstorage.api.storage.IStorage;
+import com.refinedmods.refinedstorage.api.storage.IStorage;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.util.ResourceLocation;
 

src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskContainerContext.java

@@ -1,6 +1,6 @@
-package com.raoulvdberge.refinedstorage.api.storage.disk;
+package com.refinedmods.refinedstorage.api.storage.disk;
 
-import com.raoulvdberge.refinedstorage.api.storage.AccessType;
+import com.refinedmods.refinedstorage.api.storage.AccessType;
 
 /**
  * Stores relevant information about the container where the {@link IStorageDisk} is in.

src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskFactory.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.storage.disk;
+package com.refinedmods.refinedstorage.api.storage.disk;
 
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.world.server.ServerWorld;

src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskListener.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.storage.disk;
+package com.refinedmods.refinedstorage.api.storage.disk;
 
 /**
  * Listens to storage disk changes.

src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskManager.java

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

src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskProvider.java

@@ -1,6 +1,6 @@
-package com.raoulvdberge.refinedstorage.api.storage.disk;
+package com.refinedmods.refinedstorage.api.storage.disk;
 
-import com.raoulvdberge.refinedstorage.api.storage.StorageType;
+import com.refinedmods.refinedstorage.api.storage.StorageType;
 import net.minecraft.item.ItemStack;
 
 import java.util.UUID;

src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskRegistry.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.storage.disk;
+package com.refinedmods.refinedstorage.api.storage.disk;
 
 import net.minecraft.util.ResourceLocation;
 

src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskSync.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.storage.disk;
+package com.refinedmods.refinedstorage.api.storage.disk;
 
 import javax.annotation.Nullable;
 import java.util.UUID;

src/main/java/com/refinedmods/refinedstorage/api/storage/disk/StorageDiskSyncData.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.storage.disk;
+package com.refinedmods.refinedstorage.api.storage.disk;
 
 /**
  * Contains synced info about a storage disk.

src/main/java/com/refinedmods/refinedstorage/api/storage/externalstorage/IExternalStorage.java

@@ -1,8 +1,8 @@
-package com.raoulvdberge.refinedstorage.api.storage.externalstorage;
+package com.refinedmods.refinedstorage.api.storage.externalstorage;
 
-import com.raoulvdberge.refinedstorage.api.network.INetwork;
-import com.raoulvdberge.refinedstorage.api.storage.IStorage;
-import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache;
+import com.refinedmods.refinedstorage.api.network.INetwork;
+import com.refinedmods.refinedstorage.api.storage.IStorage;
+import com.refinedmods.refinedstorage.api.storage.cache.IStorageCache;
 
 /**
  * An external storage handler.

src/main/java/com/refinedmods/refinedstorage/api/storage/externalstorage/IExternalStorageContext.java

@@ -1,6 +1,6 @@
-package com.raoulvdberge.refinedstorage.api.storage.externalstorage;
+package com.refinedmods.refinedstorage.api.storage.externalstorage;
 
-import com.raoulvdberge.refinedstorage.api.storage.AccessType;
+import com.refinedmods.refinedstorage.api.storage.AccessType;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 

src/main/java/com/refinedmods/refinedstorage/api/storage/externalstorage/IExternalStorageProvider.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.storage.externalstorage;
+package com.refinedmods.refinedstorage.api.storage.externalstorage;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Direction;

src/main/java/com/refinedmods/refinedstorage/api/storage/tracker/IStorageTracker.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.storage.tracker;
+package com.refinedmods.refinedstorage.api.storage.tracker;
 
 import net.minecraft.entity.player.PlayerEntity;
 

src/main/java/com/refinedmods/refinedstorage/api/storage/tracker/StorageTrackerEntry.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.storage.tracker;
+package com.refinedmods.refinedstorage.api.storage.tracker;
 
 /**
  * Represents a storage tracker entry.

src/main/java/com/refinedmods/refinedstorage/api/util/Action.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.util;
+package com.refinedmods.refinedstorage.api.util;
 
 /**
  * Defines how an action is performed.

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

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

src/main/java/com/refinedmods/refinedstorage/api/util/IFilter.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.util;
+package com.refinedmods.refinedstorage.api.util;
 
 /**
  * A filter.

src/main/java/com/refinedmods/refinedstorage/api/util/IQuantityFormatter.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.util;
+package com.refinedmods.refinedstorage.api.util;
 
 /**
  * Utilities for formatting quantities.

src/main/java/com/refinedmods/refinedstorage/api/util/IStackList.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.util;
+package com.refinedmods.refinedstorage.api.util;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

src/main/java/com/refinedmods/refinedstorage/api/util/StackListEntry.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.util;
+package com.refinedmods.refinedstorage.api.util;
 
 import java.util.UUID;
 

src/main/java/com/refinedmods/refinedstorage/api/util/StackListResult.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.api.util;
+package com.refinedmods.refinedstorage.api.util;
 
 import java.util.UUID;
 

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

@@ -1,44 +1,44 @@
-package com.raoulvdberge.refinedstorage.apiimpl;
+package com.refinedmods.refinedstorage.apiimpl;
 
-import com.raoulvdberge.refinedstorage.api.IRSAPI;
-import com.raoulvdberge.refinedstorage.api.RSAPIInject;
-import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternRenderHandler;
-import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementList;
-import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry;
-import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry;
-import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadException;
-import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingRequestInfo;
-import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskRegistry;
-import com.raoulvdberge.refinedstorage.api.network.INetworkManager;
-import com.raoulvdberge.refinedstorage.api.network.grid.ICraftingGridBehavior;
-import com.raoulvdberge.refinedstorage.api.network.grid.IGridManager;
-import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode;
-import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeManager;
-import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeRegistry;
-import com.raoulvdberge.refinedstorage.api.storage.StorageType;
-import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk;
-import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskManager;
-import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskRegistry;
-import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskSync;
-import com.raoulvdberge.refinedstorage.api.storage.externalstorage.IExternalStorageProvider;
-import com.raoulvdberge.refinedstorage.api.util.IComparer;
-import com.raoulvdberge.refinedstorage.api.util.IQuantityFormatter;
-import com.raoulvdberge.refinedstorage.api.util.IStackList;
-import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementList;
-import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementRegistry;
-import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementRegistry;
-import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingRequestInfo;
-import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingTaskRegistry;
-import com.raoulvdberge.refinedstorage.apiimpl.network.NetworkManager;
-import com.raoulvdberge.refinedstorage.apiimpl.network.NetworkNodeManager;
-import com.raoulvdberge.refinedstorage.apiimpl.network.NetworkNodeRegistry;
-import com.raoulvdberge.refinedstorage.apiimpl.network.grid.CraftingGridBehavior;
-import com.raoulvdberge.refinedstorage.apiimpl.network.grid.GridManager;
-import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.*;
-import com.raoulvdberge.refinedstorage.apiimpl.util.Comparer;
-import com.raoulvdberge.refinedstorage.apiimpl.util.FluidStackList;
-import com.raoulvdberge.refinedstorage.apiimpl.util.ItemStackList;
-import com.raoulvdberge.refinedstorage.apiimpl.util.QuantityFormatter;
+import com.refinedmods.refinedstorage.api.IRSAPI;
+import com.refinedmods.refinedstorage.api.RSAPIInject;
+import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternRenderHandler;
+import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementList;
+import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry;
+import com.refinedmods.refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry;
+import com.refinedmods.refinedstorage.api.autocrafting.task.CraftingTaskReadException;
+import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingRequestInfo;
+import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTaskRegistry;
+import com.refinedmods.refinedstorage.api.network.INetworkManager;
+import com.refinedmods.refinedstorage.api.network.grid.ICraftingGridBehavior;
+import com.refinedmods.refinedstorage.api.network.grid.IGridManager;
+import com.refinedmods.refinedstorage.api.network.node.INetworkNode;
+import com.refinedmods.refinedstorage.api.network.node.INetworkNodeManager;
+import com.refinedmods.refinedstorage.api.network.node.INetworkNodeRegistry;
+import com.refinedmods.refinedstorage.api.storage.StorageType;
+import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk;
+import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskManager;
+import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskRegistry;
+import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskSync;
+import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorageProvider;
+import com.refinedmods.refinedstorage.api.util.IComparer;
+import com.refinedmods.refinedstorage.api.util.IQuantityFormatter;
+import com.refinedmods.refinedstorage.api.util.IStackList;
+import com.refinedmods.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementList;
+import com.refinedmods.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementRegistry;
+import com.refinedmods.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementRegistry;
+import com.refinedmods.refinedstorage.apiimpl.autocrafting.task.CraftingRequestInfo;
+import com.refinedmods.refinedstorage.apiimpl.autocrafting.task.CraftingTaskRegistry;
+import com.refinedmods.refinedstorage.apiimpl.network.NetworkManager;
+import com.refinedmods.refinedstorage.apiimpl.network.NetworkNodeManager;
+import com.refinedmods.refinedstorage.apiimpl.network.NetworkNodeRegistry;
+import com.refinedmods.refinedstorage.apiimpl.network.grid.CraftingGridBehavior;
+import com.refinedmods.refinedstorage.apiimpl.network.grid.GridManager;
+import com.refinedmods.refinedstorage.apiimpl.storage.disk.*;
+import com.refinedmods.refinedstorage.apiimpl.util.Comparer;
+import com.refinedmods.refinedstorage.apiimpl.util.FluidStackList;
+import com.refinedmods.refinedstorage.apiimpl.util.ItemStackList;
+import com.refinedmods.refinedstorage.apiimpl.util.QuantityFormatter;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.nbt.INBT;

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/AllowedTagList.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.apiimpl.autocrafting;
+package com.refinedmods.refinedstorage.apiimpl.autocrafting;
 
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.nbt.ListNBT;

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingManager.java

@@ -1,18 +1,18 @@
-package com.raoulvdberge.refinedstorage.apiimpl.autocrafting;
+package com.refinedmods.refinedstorage.apiimpl.autocrafting;
 
-import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingManager;
-import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
-import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternChainList;
-import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternContainer;
-import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorListener;
-import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadException;
-import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask;
-import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskError;
-import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskFactory;
-import com.raoulvdberge.refinedstorage.api.network.INetwork;
-import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode;
-import com.raoulvdberge.refinedstorage.api.util.IComparer;
-import com.raoulvdberge.refinedstorage.apiimpl.API;
+import com.refinedmods.refinedstorage.api.autocrafting.ICraftingManager;
+import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern;
+import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternChainList;
+import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternContainer;
+import com.refinedmods.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorListener;
+import com.refinedmods.refinedstorage.api.autocrafting.task.CraftingTaskReadException;
+import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTask;
+import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTaskError;
+import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTaskFactory;
+import com.refinedmods.refinedstorage.api.network.INetwork;
+import com.refinedmods.refinedstorage.api.network.node.INetworkNode;
+import com.refinedmods.refinedstorage.api.util.IComparer;
+import com.refinedmods.refinedstorage.apiimpl.API;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.nbt.ListNBT;

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

@@ -1,10 +1,11 @@
-package com.raoulvdberge.refinedstorage.apiimpl.autocrafting;
+package com.refinedmods.refinedstorage.apiimpl.autocrafting;
 
-import com.raoulvdberge.refinedstorage.RS;
-import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
-import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternContainer;
-import com.raoulvdberge.refinedstorage.api.util.IComparer;
-import com.raoulvdberge.refinedstorage.apiimpl.API;
+import com.refinedmods.refinedstorage.RS;
+import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern;
+import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternContainer;
+import com.refinedmods.refinedstorage.api.util.IComparer;
+import com.refinedmods.refinedstorage.apiimpl.API;
+import com.refinedmods.refinedstorage.apiimpl.autocrafting.task.v5.CraftingTaskFactory;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.inventory.CraftingInventory;
 import net.minecraft.inventory.container.Container;
@@ -165,8 +166,8 @@ public class CraftingPattern implements ICraftingPattern {
 
     @Override
     public ResourceLocation getCraftingTaskFactoryId() {
-        return RS.SERVER_CONFIG.getAutocrafting().useExperimentalAutocrafting() ? com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v6.CraftingTaskFactory.ID :
-            com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v5.CraftingTaskFactory.ID;
+        return RS.SERVER_CONFIG.getAutocrafting().useExperimentalAutocrafting() ? com.refinedmods.refinedstorage.apiimpl.autocrafting.task.v6.CraftingTaskFactory.ID :
+            CraftingTaskFactory.ID;
     }
 
     @Override

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternChain.java

@@ -1,7 +1,7 @@
-package com.raoulvdberge.refinedstorage.apiimpl.autocrafting;
+package com.refinedmods.refinedstorage.apiimpl.autocrafting;
 
-import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
-import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternChain;
+import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern;
+import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternChain;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternChainList.java

@@ -1,8 +1,8 @@
-package com.raoulvdberge.refinedstorage.apiimpl.autocrafting;
+package com.refinedmods.refinedstorage.apiimpl.autocrafting;
 
-import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
-import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternChain;
-import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternChainList;
+import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern;
+import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternChain;
+import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternChainList;
 
 import java.util.Collection;
 import java.util.HashMap;

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java

@@ -1,7 +1,7 @@
-package com.raoulvdberge.refinedstorage.apiimpl.autocrafting;
+package com.refinedmods.refinedstorage.apiimpl.autocrafting;
 
-import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternContainer;
-import com.raoulvdberge.refinedstorage.item.PatternItem;
+import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternContainer;
+import com.refinedmods.refinedstorage.item.PatternItem;
 import net.minecraft.fluid.Fluid;
 import net.minecraft.inventory.CraftingInventory;
 import net.minecraft.item.Item;

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactoryException.java

@@ -1,4 +1,4 @@
-package com.raoulvdberge.refinedstorage.apiimpl.autocrafting;
+package com.refinedmods.refinedstorage.apiimpl.autocrafting;
 
 import net.minecraft.util.text.ITextComponent;