That package move was not needed

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

@@ -21,8 +21,8 @@ import refinedstorage.RefinedStorage;
 import refinedstorage.RefinedStorageBlocks;
 import refinedstorage.RefinedStorageGui;
 import refinedstorage.item.ItemBlockController;
+import refinedstorage.tile.TileController;
 import refinedstorage.tile.TileMachine;
-import refinedstorage.tile.controller.TileController;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -4,7 +4,7 @@ import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderHelper;
 import refinedstorage.container.ContainerController;
 import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
-import refinedstorage.tile.controller.TileController;
+import refinedstorage.tile.TileController;
 
 import java.util.List;
 

src/main/java/refinedstorage/gui/GuiCraftingSettings.java

@@ -6,7 +6,7 @@ import net.minecraft.client.gui.GuiTextField;
 import net.minecraftforge.fml.client.FMLClientHandler;
 import org.lwjgl.input.Keyboard;
 import refinedstorage.container.ContainerDummy;
-import refinedstorage.tile.controller.TileController;
+import refinedstorage.tile.TileController;
 
 import java.io.IOException;
 

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

@@ -14,7 +14,6 @@ import refinedstorage.tile.*;
 import refinedstorage.tile.autocrafting.TileCrafter;
 import refinedstorage.tile.autocrafting.TileCraftingMonitor;
 import refinedstorage.tile.autocrafting.TileProcessingPatternEncoder;
-import refinedstorage.tile.controller.TileController;
 import refinedstorage.tile.grid.TileGrid;
 import refinedstorage.tile.grid.WirelessGrid;
 import refinedstorage.tile.solderer.TileSolderer;

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

@@ -7,7 +7,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 import refinedstorage.RefinedStorageBlocks;
 import refinedstorage.block.EnumControllerType;
-import refinedstorage.tile.controller.TileController;
+import refinedstorage.tile.TileController;
 
 import java.util.List;
 

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

@@ -17,7 +17,7 @@ import net.minecraft.util.text.translation.I18n;
 import net.minecraft.world.World;
 import refinedstorage.RefinedStorage;
 import refinedstorage.RefinedStorageBlocks;
-import refinedstorage.tile.controller.TileController;
+import refinedstorage.tile.TileController;
 import refinedstorage.tile.grid.TileGrid;
 
 import java.util.List;

src/main/java/refinedstorage/network/MessageControllerEnergyUpdate.java

@@ -9,7 +9,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
 import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
 import refinedstorage.RefinedStorageUtils;
 import refinedstorage.proxy.ClientProxy;
-import refinedstorage.tile.controller.TileController;
+import refinedstorage.tile.TileController;
 
 public class MessageControllerEnergyUpdate implements IMessage, IMessageHandler<MessageControllerEnergyUpdate, IMessage> {
     public static long LAST_RE_RENDER;

src/main/java/refinedstorage/network/MessageWirelessGridCraftingStart.java

@@ -5,7 +5,7 @@ import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
-import refinedstorage.tile.controller.TileController;
+import refinedstorage.tile.TileController;
 
 public class MessageWirelessGridCraftingStart extends MessageHandlerPlayerToServer<MessageWirelessGridCraftingStart> implements IMessage {
     private int controllerX;

src/main/java/refinedstorage/network/MessageWirelessGridItems.java

@@ -5,7 +5,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
 import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
 import refinedstorage.storage.ItemGroup;
-import refinedstorage.tile.controller.TileController;
+import refinedstorage.tile.TileController;
 import refinedstorage.tile.grid.WirelessGrid;
 
 import java.util.ArrayList;

src/main/java/refinedstorage/network/MessageWirelessGridStoragePull.java

@@ -5,7 +5,7 @@ import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
-import refinedstorage.tile.controller.TileController;
+import refinedstorage.tile.TileController;
 
 public class MessageWirelessGridStoragePull extends MessageHandlerPlayerToServer<MessageWirelessGridStoragePull> implements IMessage {
     private int controllerX;

src/main/java/refinedstorage/network/MessageWirelessGridStoragePush.java

@@ -5,7 +5,7 @@ import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
-import refinedstorage.tile.controller.TileController;
+import refinedstorage.tile.TileController;
 
 public class MessageWirelessGridStoragePush extends MessageHandlerPlayerToServer<MessageWirelessGridStoragePush> implements IMessage {
     private int controllerX;

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

@@ -26,7 +26,6 @@ import refinedstorage.tile.*;
 import refinedstorage.tile.autocrafting.TileCrafter;
 import refinedstorage.tile.autocrafting.TileCraftingMonitor;
 import refinedstorage.tile.autocrafting.TileProcessingPatternEncoder;
-import refinedstorage.tile.controller.TileController;
 import refinedstorage.tile.grid.TileGrid;
 import refinedstorage.tile.solderer.*;
 

src/main/java/refinedstorage/tile/ControllerSearcher.java

@@ -4,7 +4,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import refinedstorage.tile.controller.TileController;
 
 import java.util.Set;
 

src/main/java/refinedstorage/tile/CraftingTaskScheduler.java

@@ -4,7 +4,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import refinedstorage.RefinedStorageUtils;
 import refinedstorage.tile.autocrafting.CraftingPattern;
-import refinedstorage.tile.controller.TileController;
 
 public class CraftingTaskScheduler {
     public static String NBT_SCHEDULED = "CraftingTaskScheduled";

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

@@ -1,4 +1,4 @@
-package refinedstorage.tile.controller;
+package refinedstorage.tile;
 
 import cofh.api.energy.EnergyStorage;
 import cofh.api.energy.IEnergyReceiver;
@@ -27,10 +27,6 @@ import refinedstorage.network.MessageWirelessGridItems;
 import refinedstorage.storage.IStorage;
 import refinedstorage.storage.IStorageProvider;
 import refinedstorage.storage.ItemGroup;
-import refinedstorage.tile.ISynchronizedContainer;
-import refinedstorage.tile.TileBase;
-import refinedstorage.tile.TileMachine;
-import refinedstorage.tile.TileWirelessTransmitter;
 import refinedstorage.tile.autocrafting.CraftingPattern;
 import refinedstorage.tile.autocrafting.TileCrafter;
 import refinedstorage.tile.autocrafting.task.BasicCraftingTask;

src/main/java/refinedstorage/tile/TileMachine.java

@@ -10,7 +10,6 @@ import refinedstorage.RefinedStorageUtils;
 import refinedstorage.network.MessageMachineConnectedUpdate;
 import refinedstorage.tile.config.IRedstoneModeConfig;
 import refinedstorage.tile.config.RedstoneMode;
-import refinedstorage.tile.controller.TileController;
 
 import java.util.HashSet;
 import java.util.Set;

src/main/java/refinedstorage/tile/autocrafting/task/BasicCraftingTask.java

@@ -6,8 +6,8 @@ import net.minecraft.nbt.NBTTagList;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.common.util.Constants;
 import refinedstorage.RefinedStorageUtils;
+import refinedstorage.tile.TileController;
 import refinedstorage.tile.autocrafting.CraftingPattern;
-import refinedstorage.tile.controller.TileController;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/refinedstorage/tile/autocrafting/task/ICraftingTask.java

@@ -1,8 +1,8 @@
 package refinedstorage.tile.autocrafting.task;
 
 import net.minecraft.nbt.NBTTagCompound;
+import refinedstorage.tile.TileController;
 import refinedstorage.tile.autocrafting.CraftingPattern;
-import refinedstorage.tile.controller.TileController;
 
 public interface ICraftingTask {
     CraftingPattern getPattern();

src/main/java/refinedstorage/tile/autocrafting/task/ProcessingCraftingTask.java

@@ -7,9 +7,9 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityHopper;
 import net.minecraft.util.text.TextFormatting;
 import refinedstorage.RefinedStorageUtils;
+import refinedstorage.tile.TileController;
 import refinedstorage.tile.autocrafting.CraftingPattern;
 import refinedstorage.tile.autocrafting.TileCrafter;
-import refinedstorage.tile.controller.TileController;
 
 public class ProcessingCraftingTask implements ICraftingTask {
     public static final int ID = 1;

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

@@ -14,8 +14,8 @@ import refinedstorage.network.MessageWirelessGridSettingsUpdate;
 import refinedstorage.network.MessageWirelessGridStoragePull;
 import refinedstorage.network.MessageWirelessGridStoragePush;
 import refinedstorage.storage.ItemGroup;
+import refinedstorage.tile.TileController;
 import refinedstorage.tile.config.IRedstoneModeConfig;
-import refinedstorage.tile.controller.TileController;
 
 import java.util.ArrayList;
 import java.util.List;