From 9cd5f2487c3fe5659ca4fe3a644c4c0340acd712 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Fri, 18 Dec 2015 03:56:25 +0100 Subject: [PATCH] move classes to other package --- .../{inventory => container}/ContainerController.java | 2 +- .../{inventory => container}/ContainerDrive.java | 2 +- .../{inventory => container}/ContainerGrid.java | 2 +- .../{inventory => container}/ContainerImporter.java | 2 +- .../{inventory => container}/ContainerSC.java | 2 +- src/main/java/storagecraft/gui/GuiController.java | 2 +- src/main/java/storagecraft/gui/GuiDrive.java | 2 +- src/main/java/storagecraft/gui/GuiGrid.java | 2 +- src/main/java/storagecraft/gui/GuiHandler.java | 8 ++++---- src/main/java/storagecraft/gui/GuiImporter.java | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) rename src/main/java/storagecraft/{inventory => container}/ContainerController.java (83%) rename src/main/java/storagecraft/{inventory => container}/ContainerDrive.java (90%) rename src/main/java/storagecraft/{inventory => container}/ContainerGrid.java (82%) rename src/main/java/storagecraft/{inventory => container}/ContainerImporter.java (89%) rename src/main/java/storagecraft/{inventory => container}/ContainerSC.java (92%) diff --git a/src/main/java/storagecraft/inventory/ContainerController.java b/src/main/java/storagecraft/container/ContainerController.java similarity index 83% rename from src/main/java/storagecraft/inventory/ContainerController.java rename to src/main/java/storagecraft/container/ContainerController.java index 3dd82f240..3517cecd1 100644 --- a/src/main/java/storagecraft/inventory/ContainerController.java +++ b/src/main/java/storagecraft/container/ContainerController.java @@ -1,4 +1,4 @@ -package storagecraft.inventory; +package storagecraft.container; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/storagecraft/inventory/ContainerDrive.java b/src/main/java/storagecraft/container/ContainerDrive.java similarity index 90% rename from src/main/java/storagecraft/inventory/ContainerDrive.java rename to src/main/java/storagecraft/container/ContainerDrive.java index 8f41f4525..f1d9bd255 100644 --- a/src/main/java/storagecraft/inventory/ContainerDrive.java +++ b/src/main/java/storagecraft/container/ContainerDrive.java @@ -1,4 +1,4 @@ -package storagecraft.inventory; +package storagecraft.container; import net.minecraft.entity.player.EntityPlayer; import storagecraft.SCItems; diff --git a/src/main/java/storagecraft/inventory/ContainerGrid.java b/src/main/java/storagecraft/container/ContainerGrid.java similarity index 82% rename from src/main/java/storagecraft/inventory/ContainerGrid.java rename to src/main/java/storagecraft/container/ContainerGrid.java index ac38c06e5..9b3375b47 100644 --- a/src/main/java/storagecraft/inventory/ContainerGrid.java +++ b/src/main/java/storagecraft/container/ContainerGrid.java @@ -1,4 +1,4 @@ -package storagecraft.inventory; +package storagecraft.container; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/storagecraft/inventory/ContainerImporter.java b/src/main/java/storagecraft/container/ContainerImporter.java similarity index 89% rename from src/main/java/storagecraft/inventory/ContainerImporter.java rename to src/main/java/storagecraft/container/ContainerImporter.java index bffb38ba4..4f1774549 100644 --- a/src/main/java/storagecraft/inventory/ContainerImporter.java +++ b/src/main/java/storagecraft/container/ContainerImporter.java @@ -1,4 +1,4 @@ -package storagecraft.inventory; +package storagecraft.container; import net.minecraft.entity.player.EntityPlayer; import storagecraft.inventory.slot.SlotSpecimen; diff --git a/src/main/java/storagecraft/inventory/ContainerSC.java b/src/main/java/storagecraft/container/ContainerSC.java similarity index 92% rename from src/main/java/storagecraft/inventory/ContainerSC.java rename to src/main/java/storagecraft/container/ContainerSC.java index 9f7d98c8a..49d77df0b 100644 --- a/src/main/java/storagecraft/inventory/ContainerSC.java +++ b/src/main/java/storagecraft/container/ContainerSC.java @@ -1,4 +1,4 @@ -package storagecraft.inventory; +package storagecraft.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/storagecraft/gui/GuiController.java b/src/main/java/storagecraft/gui/GuiController.java index 89d439388..046605465 100644 --- a/src/main/java/storagecraft/gui/GuiController.java +++ b/src/main/java/storagecraft/gui/GuiController.java @@ -6,7 +6,7 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; -import storagecraft.inventory.ContainerController; +import storagecraft.container.ContainerController; import storagecraft.tile.TileController; public class GuiController extends GuiContainer { diff --git a/src/main/java/storagecraft/gui/GuiDrive.java b/src/main/java/storagecraft/gui/GuiDrive.java index 9ba9efaf6..ed8204348 100644 --- a/src/main/java/storagecraft/gui/GuiDrive.java +++ b/src/main/java/storagecraft/gui/GuiDrive.java @@ -4,7 +4,7 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; -import storagecraft.inventory.ContainerDrive; +import storagecraft.container.ContainerDrive; public class GuiDrive extends GuiContainer { public static final ResourceLocation DRIVE_RESOURCE = new ResourceLocation("storagecraft:textures/gui/drive.png"); diff --git a/src/main/java/storagecraft/gui/GuiGrid.java b/src/main/java/storagecraft/gui/GuiGrid.java index dfb0c6840..ed0af90f1 100644 --- a/src/main/java/storagecraft/gui/GuiGrid.java +++ b/src/main/java/storagecraft/gui/GuiGrid.java @@ -8,7 +8,7 @@ import net.minecraft.util.StatCollector; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import storagecraft.SC; -import storagecraft.inventory.ContainerGrid; +import storagecraft.container.ContainerGrid; import storagecraft.network.MessageStoragePull; import storagecraft.network.MessageStoragePush; import storagecraft.tile.TileController; diff --git a/src/main/java/storagecraft/gui/GuiHandler.java b/src/main/java/storagecraft/gui/GuiHandler.java index 780a304a6..800180f02 100644 --- a/src/main/java/storagecraft/gui/GuiHandler.java +++ b/src/main/java/storagecraft/gui/GuiHandler.java @@ -6,10 +6,10 @@ import net.minecraft.inventory.Container; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import storagecraft.SC; -import storagecraft.inventory.ContainerController; -import storagecraft.inventory.ContainerDrive; -import storagecraft.inventory.ContainerGrid; -import storagecraft.inventory.ContainerImporter; +import storagecraft.container.ContainerController; +import storagecraft.container.ContainerDrive; +import storagecraft.container.ContainerGrid; +import storagecraft.container.ContainerImporter; import storagecraft.tile.TileController; import storagecraft.tile.TileDrive; import storagecraft.tile.TileGrid; diff --git a/src/main/java/storagecraft/gui/GuiImporter.java b/src/main/java/storagecraft/gui/GuiImporter.java index add5e037d..da60d2c19 100644 --- a/src/main/java/storagecraft/gui/GuiImporter.java +++ b/src/main/java/storagecraft/gui/GuiImporter.java @@ -6,7 +6,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; import storagecraft.SC; -import storagecraft.inventory.ContainerImporter; +import storagecraft.container.ContainerImporter; import storagecraft.network.MessageImporterUpdate; import storagecraft.tile.TileImporter; import storagecraft.util.InventoryUtils;