From d49f4e9751ae4e684010c64e0448d89c7b2a5b2e Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Wed, 18 May 2016 02:22:43 +0200 Subject: [PATCH] That package move was not needed --- src/main/java/refinedstorage/block/BlockController.java | 2 +- src/main/java/refinedstorage/gui/GuiController.java | 2 +- src/main/java/refinedstorage/gui/GuiCraftingSettings.java | 2 +- src/main/java/refinedstorage/gui/GuiHandler.java | 1 - src/main/java/refinedstorage/item/ItemBlockController.java | 2 +- src/main/java/refinedstorage/item/ItemWirelessGrid.java | 2 +- .../network/MessageControllerEnergyUpdate.java | 2 +- .../network/MessageWirelessGridCraftingStart.java | 2 +- .../refinedstorage/network/MessageWirelessGridItems.java | 2 +- .../network/MessageWirelessGridStoragePull.java | 2 +- .../network/MessageWirelessGridStoragePush.java | 2 +- src/main/java/refinedstorage/proxy/CommonProxy.java | 1 - src/main/java/refinedstorage/tile/ControllerSearcher.java | 1 - .../java/refinedstorage/tile/CraftingTaskScheduler.java | 1 - .../tile/{controller => }/TileController.java | 6 +----- src/main/java/refinedstorage/tile/TileMachine.java | 1 - .../tile/autocrafting/task/BasicCraftingTask.java | 2 +- .../tile/autocrafting/task/ICraftingTask.java | 2 +- .../tile/autocrafting/task/ProcessingCraftingTask.java | 2 +- src/main/java/refinedstorage/tile/grid/WirelessGrid.java | 2 +- 20 files changed, 15 insertions(+), 24 deletions(-) rename src/main/java/refinedstorage/tile/{controller => }/TileController.java (99%) diff --git a/src/main/java/refinedstorage/block/BlockController.java b/src/main/java/refinedstorage/block/BlockController.java index c6f9d6082..e46e9bcef 100755 --- a/src/main/java/refinedstorage/block/BlockController.java +++ b/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; diff --git a/src/main/java/refinedstorage/gui/GuiController.java b/src/main/java/refinedstorage/gui/GuiController.java index 125bb4737..caddf5307 100755 --- a/src/main/java/refinedstorage/gui/GuiController.java +++ b/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; diff --git a/src/main/java/refinedstorage/gui/GuiCraftingSettings.java b/src/main/java/refinedstorage/gui/GuiCraftingSettings.java index d9aa66206..f63a4052b 100755 --- a/src/main/java/refinedstorage/gui/GuiCraftingSettings.java +++ b/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; diff --git a/src/main/java/refinedstorage/gui/GuiHandler.java b/src/main/java/refinedstorage/gui/GuiHandler.java index bf0dddbdb..adfbf43c9 100755 --- a/src/main/java/refinedstorage/gui/GuiHandler.java +++ b/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; diff --git a/src/main/java/refinedstorage/item/ItemBlockController.java b/src/main/java/refinedstorage/item/ItemBlockController.java index 0496f1698..edd06c89b 100755 --- a/src/main/java/refinedstorage/item/ItemBlockController.java +++ b/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; diff --git a/src/main/java/refinedstorage/item/ItemWirelessGrid.java b/src/main/java/refinedstorage/item/ItemWirelessGrid.java index 694e74085..bfd88f378 100755 --- a/src/main/java/refinedstorage/item/ItemWirelessGrid.java +++ b/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; diff --git a/src/main/java/refinedstorage/network/MessageControllerEnergyUpdate.java b/src/main/java/refinedstorage/network/MessageControllerEnergyUpdate.java index 9ab9155ff..123fca91f 100755 --- a/src/main/java/refinedstorage/network/MessageControllerEnergyUpdate.java +++ b/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 { public static long LAST_RE_RENDER; diff --git a/src/main/java/refinedstorage/network/MessageWirelessGridCraftingStart.java b/src/main/java/refinedstorage/network/MessageWirelessGridCraftingStart.java index eda0062bd..da8dff55c 100755 --- a/src/main/java/refinedstorage/network/MessageWirelessGridCraftingStart.java +++ b/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 implements IMessage { private int controllerX; diff --git a/src/main/java/refinedstorage/network/MessageWirelessGridItems.java b/src/main/java/refinedstorage/network/MessageWirelessGridItems.java index c21051c54..3bf9e982c 100755 --- a/src/main/java/refinedstorage/network/MessageWirelessGridItems.java +++ b/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; diff --git a/src/main/java/refinedstorage/network/MessageWirelessGridStoragePull.java b/src/main/java/refinedstorage/network/MessageWirelessGridStoragePull.java index aae1c56a2..5d3c62e2b 100755 --- a/src/main/java/refinedstorage/network/MessageWirelessGridStoragePull.java +++ b/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 implements IMessage { private int controllerX; diff --git a/src/main/java/refinedstorage/network/MessageWirelessGridStoragePush.java b/src/main/java/refinedstorage/network/MessageWirelessGridStoragePush.java index 7dcf24057..40502c63b 100755 --- a/src/main/java/refinedstorage/network/MessageWirelessGridStoragePush.java +++ b/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 implements IMessage { private int controllerX; diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java index 61434ba3f..f81103b1d 100755 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/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.*; diff --git a/src/main/java/refinedstorage/tile/ControllerSearcher.java b/src/main/java/refinedstorage/tile/ControllerSearcher.java index 9bef4c43f..6f732725a 100755 --- a/src/main/java/refinedstorage/tile/ControllerSearcher.java +++ b/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; diff --git a/src/main/java/refinedstorage/tile/CraftingTaskScheduler.java b/src/main/java/refinedstorage/tile/CraftingTaskScheduler.java index 0ecbd9824..1bf0679fa 100755 --- a/src/main/java/refinedstorage/tile/CraftingTaskScheduler.java +++ b/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"; diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/TileController.java similarity index 99% rename from src/main/java/refinedstorage/tile/controller/TileController.java rename to src/main/java/refinedstorage/tile/TileController.java index 5bf995d8e..cead0b396 100755 --- a/src/main/java/refinedstorage/tile/controller/TileController.java +++ b/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; diff --git a/src/main/java/refinedstorage/tile/TileMachine.java b/src/main/java/refinedstorage/tile/TileMachine.java index 59ec5f3ab..e60490cb0 100755 --- a/src/main/java/refinedstorage/tile/TileMachine.java +++ b/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; diff --git a/src/main/java/refinedstorage/tile/autocrafting/task/BasicCraftingTask.java b/src/main/java/refinedstorage/tile/autocrafting/task/BasicCraftingTask.java index 547a35cf5..7723763df 100755 --- a/src/main/java/refinedstorage/tile/autocrafting/task/BasicCraftingTask.java +++ b/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; diff --git a/src/main/java/refinedstorage/tile/autocrafting/task/ICraftingTask.java b/src/main/java/refinedstorage/tile/autocrafting/task/ICraftingTask.java index aa8ffd06f..73f000fd6 100755 --- a/src/main/java/refinedstorage/tile/autocrafting/task/ICraftingTask.java +++ b/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(); diff --git a/src/main/java/refinedstorage/tile/autocrafting/task/ProcessingCraftingTask.java b/src/main/java/refinedstorage/tile/autocrafting/task/ProcessingCraftingTask.java index d816d3d0f..6fb332f18 100755 --- a/src/main/java/refinedstorage/tile/autocrafting/task/ProcessingCraftingTask.java +++ b/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; diff --git a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java index 30df73150..08843539f 100755 --- a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java +++ b/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;