refactor classes

20 files changed, 35 insertions, 38 deletions

diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java
index 49b989f794..493d3aa115 100644
--- a/src/main/java/com/github/technus/tectech/TecTech.java
+++ b/src/main/java/com/github/technus/tectech/TecTech.java
@@ -2,11 +2,11 @@ package com.github.technus.tectech;
 
 import com.github.technus.tectech.loader.MainLoader;
 import com.github.technus.tectech.loader.TecTechConfig;
-import com.github.technus.tectech.mechanics.ConvertFloat;
-import com.github.technus.tectech.mechanics.ConvertInteger;
-import com.github.technus.tectech.mechanics.PlayerPersistence;
+import com.github.technus.tectech.mechanics.commands.ConvertFloat;
+import com.github.technus.tectech.mechanics.commands.ConvertInteger;
 import com.github.technus.tectech.mechanics.anomaly.AnomalyHandler;
-import com.github.technus.tectech.chunkData.ChunkDataHandler;
+import com.github.technus.tectech.mechanics.data.ChunkDataHandler;
+import com.github.technus.tectech.mechanics.data.PlayerPersistence;
 import com.github.technus.tectech.mechanics.elementalMatter.core.commands.GiveEM;
 import com.github.technus.tectech.mechanics.elementalMatter.core.commands.ListEM;
 import com.github.technus.tectech.proxy.CommonProxy;
diff --git a/src/main/java/com/github/technus/tectech/loader/mechanics/ElementalLoader.java b/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java
index a2ea8c60de..130106a76b 100644
--- a/src/main/java/com/github/technus/tectech/loader/mechanics/ElementalLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.loader.mechanics;
+package com.github.technus.tectech.loader;
 
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.dComplexAspectDefinition;
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.ePrimalAspectDefinition;
diff --git a/src/main/java/com/github/technus/tectech/loader/entity/EntityLoader.java b/src/main/java/com/github/technus/tectech/loader/EntityLoader.java
index 209d7ccd39..b188989ba3 100644
--- a/src/main/java/com/github/technus/tectech/loader/entity/EntityLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/EntityLoader.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.loader.entity;
+package com.github.technus.tectech.loader;
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles.projectileEM;
diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
index 2272733d5a..b45e8bd532 100644
--- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
@@ -6,11 +6,8 @@ import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.defin
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.AspectDefinitionCompatEnabled;
 import com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat;
 import com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompatEnabled;
-import com.github.technus.tectech.loader.entity.EntityLoader;
 import com.github.technus.tectech.loader.gui.CreativeTabTecTech;
 import com.github.technus.tectech.loader.gui.ModGuiHandler;
-import com.github.technus.tectech.loader.mechanics.ElementalLoader;
-import com.github.technus.tectech.loader.network.NetworkDispatcher;
 import com.github.technus.tectech.loader.recipe.RecipeLoader;
 import com.github.technus.tectech.loader.thing.ComponentLoader;
 import com.github.technus.tectech.loader.thing.MachineLoader;
diff --git a/src/main/java/com/github/technus/tectech/loader/network/NetworkDispatcher.java b/src/main/java/com/github/technus/tectech/loader/NetworkDispatcher.java
index e424edd385..0f20d31f4d 100644
--- a/src/main/java/com/github/technus/tectech/loader/network/NetworkDispatcher.java
+++ b/src/main/java/com/github/technus/tectech/loader/NetworkDispatcher.java
@@ -1,4 +1,9 @@
-package com.github.technus.tectech.loader.network;
+package com.github.technus.tectech.loader;
+
+import com.github.technus.tectech.thing.metaTileEntity.pipe.PipeActivityMessage;
+import com.github.technus.tectech.thing.metaTileEntity.RotationMessage;
+import com.github.technus.tectech.mechanics.data.ChunkDataMessage;
+import com.github.technus.tectech.mechanics.data.PlayerDataMessage;
 
 import static com.github.technus.tectech.Reference.MODID;
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
index fcc0242432..4f76b22279 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
@@ -2,12 +2,12 @@ package com.github.technus.tectech.mechanics.anomaly;
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.Util;
-import com.github.technus.tectech.chunkData.ChunkDataHandler;
-import com.github.technus.tectech.chunkData.IChunkMetaDataHandler;
+import com.github.technus.tectech.mechanics.data.ChunkDataHandler;
+import com.github.technus.tectech.mechanics.data.IChunkMetaDataHandler;
 import com.github.technus.tectech.loader.MainLoader;
-import com.github.technus.tectech.loader.network.ChunkDataMessage;
-import com.github.technus.tectech.loader.network.NetworkDispatcher;
-import com.github.technus.tectech.loader.network.PlayerDataMessage;
+import com.github.technus.tectech.mechanics.data.ChunkDataMessage;
+import com.github.technus.tectech.loader.NetworkDispatcher;
+import com.github.technus.tectech.mechanics.data.PlayerDataMessage;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.atom.dAtomDefinition;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import gregtech.api.GregTech_API;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/ConvertFloat.java b/src/main/java/com/github/technus/tectech/mechanics/commands/ConvertFloat.java
index 8e25b8908a..61fa56f93a 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/ConvertFloat.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/commands/ConvertFloat.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.mechanics;
+package com.github.technus.tectech.mechanics.commands;
 
 import com.github.technus.tectech.Util;
 import net.minecraft.command.ICommand;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/ConvertInteger.java b/src/main/java/com/github/technus/tectech/mechanics/commands/ConvertInteger.java
index c381f34939..c9767560c3 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/ConvertInteger.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/commands/ConvertInteger.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.mechanics;
+package com.github.technus.tectech.mechanics.commands;
 
 import com.github.technus.tectech.Util;
 import net.minecraft.command.ICommand;
diff --git a/src/main/java/com/github/technus/tectech/chunkData/ChunkDataHandler.java b/src/main/java/com/github/technus/tectech/mechanics/data/ChunkDataHandler.java
index 108e762af0..f6d84d6b12 100644
--- a/src/main/java/com/github/technus/tectech/chunkData/ChunkDataHandler.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/data/ChunkDataHandler.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.chunkData;
+package com.github.technus.tectech.mechanics.data;
 
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
diff --git a/src/main/java/com/github/technus/tectech/loader/network/ChunkDataMessage.java b/src/main/java/com/github/technus/tectech/mechanics/data/ChunkDataMessage.java
index 15c936191a..a8ed9de2c8 100644
--- a/src/main/java/com/github/technus/tectech/loader/network/ChunkDataMessage.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/data/ChunkDataMessage.java
@@ -1,8 +1,8 @@
-package com.github.technus.tectech.loader.network;
+package com.github.technus.tectech.mechanics.data;
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.Util;
-import com.github.technus.tectech.chunkData.IChunkMetaDataHandler;
+import com.github.technus.tectech.loader.NetworkDispatcher;
 import cpw.mods.fml.common.network.ByteBufUtils;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
diff --git a/src/main/java/com/github/technus/tectech/chunkData/IChunkMetaDataHandler.java b/src/main/java/com/github/technus/tectech/mechanics/data/IChunkMetaDataHandler.java
index b5c79a4628..a8f5e013c5 100644
--- a/src/main/java/com/github/technus/tectech/chunkData/IChunkMetaDataHandler.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/data/IChunkMetaDataHandler.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.chunkData;
+package com.github.technus.tectech.mechanics.data;
 
 import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/com/github/technus/tectech/loader/network/PlayerDataMessage.java b/src/main/java/com/github/technus/tectech/mechanics/data/PlayerDataMessage.java
index 48a21423a9..ca62fb0876 100644
--- a/src/main/java/com/github/technus/tectech/loader/network/PlayerDataMessage.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/data/PlayerDataMessage.java
@@ -1,6 +1,7 @@
-package com.github.technus.tectech.loader.network;
+package com.github.technus.tectech.mechanics.data;
 
 import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.loader.NetworkDispatcher;
 import cpw.mods.fml.common.network.ByteBufUtils;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/PlayerPersistence.java b/src/main/java/com/github/technus/tectech/mechanics/data/PlayerPersistence.java
index 72416c3e0c..9282001c9a 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/PlayerPersistence.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/data/PlayerPersistence.java
@@ -1,8 +1,7 @@
-package com.github.technus.tectech.mechanics;
+package com.github.technus.tectech.mechanics.data;
 
 import com.github.technus.tectech.Util;
-import com.github.technus.tectech.loader.network.NetworkDispatcher;
-import com.github.technus.tectech.loader.network.PlayerDataMessage;
+import com.github.technus.tectech.loader.NetworkDispatcher;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.PlayerEvent;
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/com/github/technus/tectech/chunkData/WorldData.java b/src/main/java/com/github/technus/tectech/mechanics/data/WorldData.java
index 42641a015e..4f6f730c9b 100644
--- a/src/main/java/com/github/technus/tectech/chunkData/WorldData.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/data/WorldData.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.chunkData;
+package com.github.technus.tectech.mechanics.data;
 
 import net.minecraft.world.ChunkCoordIntPair;
 import net.minecraft.world.World;
diff --git a/src/main/java/com/github/technus/tectech/loader/network/RotationMessage.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/RotationMessage.java
index ec78021a60..92b38e68ea 100644
--- a/src/main/java/com/github/technus/tectech/loader/network/RotationMessage.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/RotationMessage.java
@@ -1,6 +1,5 @@
-package com.github.technus.tectech.loader.network;
+package com.github.technus.tectech.thing.metaTileEntity;
 
-import com.github.technus.tectech.thing.metaTileEntity.IFrontRotation;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import cpw.mods.fml.common.network.ByteBufUtils;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
index 90e69c4fb7..19d64910e1 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
@@ -10,8 +10,8 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElement
 import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
 import com.github.technus.tectech.thing.metaTileEntity.IFrontRotation;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.*;
-import com.github.technus.tectech.loader.network.RotationMessage;
-import com.github.technus.tectech.loader.network.NetworkDispatcher;
+import com.github.technus.tectech.thing.metaTileEntity.RotationMessage;
+import com.github.technus.tectech.loader.NetworkDispatcher;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedTexture;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java
index 3331430cb9..6c406313fb 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java
@@ -2,8 +2,7 @@ package com.github.technus.tectech.thing.metaTileEntity.pipe;
 
 import com.github.technus.tectech.CommonValues;
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.loader.network.PipeActivityMessage;
-import com.github.technus.tectech.loader.network.NetworkDispatcher;
+import com.github.technus.tectech.loader.NetworkDispatcher;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.GT_Mod;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java
index caccee07c4..742d298bc6 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java
@@ -2,8 +2,7 @@ package com.github.technus.tectech.thing.metaTileEntity.pipe;
 
 import com.github.technus.tectech.CommonValues;
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.loader.network.PipeActivityMessage;
-import com.github.technus.tectech.loader.network.NetworkDispatcher;
+import com.github.technus.tectech.loader.NetworkDispatcher;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.GT_Mod;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java
index 8ee90c6954..4cc40b471c 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java
@@ -2,8 +2,7 @@ package com.github.technus.tectech.thing.metaTileEntity.pipe;
 
 import com.github.technus.tectech.CommonValues;
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.loader.network.PipeActivityMessage;
-import com.github.technus.tectech.loader.network.NetworkDispatcher;
+import com.github.technus.tectech.loader.NetworkDispatcher;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.GT_Mod;
diff --git a/src/main/java/com/github/technus/tectech/loader/network/PipeActivityMessage.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/PipeActivityMessage.java
index 0323f19428..e7183b8838 100644
--- a/src/main/java/com/github/technus/tectech/loader/network/PipeActivityMessage.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/PipeActivityMessage.java
@@ -1,6 +1,5 @@
-package com.github.technus.tectech.loader.network;
+package com.github.technus.tectech.thing.metaTileEntity.pipe;
 
-import com.github.technus.tectech.thing.metaTileEntity.pipe.IActivePipe;
 import cpw.mods.fml.common.network.ByteBufUtils;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;