Change namespace againHEADmain

16 files changed, 28 insertions, 28 deletions

diff --git a/src/main/java/net/cshift/api/transit/Transit.java b/src/main/java/net/cshift/transit/Transit.java
index 6d0523d..3663fbe 100644
--- a/src/main/java/net/cshift/api/transit/Transit.java
+++ b/src/main/java/net/cshift/transit/Transit.java
@@ -22,13 +22,13 @@
 	SOFTWARE.
 */
 
-package net.cshift.api.transit;
+package net.cshift.transit;
 
 import net.fabricmc.api.ModInitializer;
 
 import org.slf4j.*;
 
-import net.cshift.api.transit.type.group.*;
+import net.cshift.transit.type.group.*;
 
 /**
  * @author Kyle Gunger
diff --git a/src/main/java/net/cshift/api/transit/network/Channel.java b/src/main/java/net/cshift/transit/network/Channel.java
index 758c7d4..311ed4b 100644
--- a/src/main/java/net/cshift/api/transit/network/Channel.java
+++ b/src/main/java/net/cshift/transit/network/Channel.java
@@ -22,11 +22,11 @@
 	SOFTWARE.
 */
 
-package net.cshift.api.transit.network;
+package net.cshift.transit.network;
 
-import net.cshift.api.transit.network.packet.IStaticPacket;
-import net.cshift.api.transit.type.group.GroupRegistry;
-import net.cshift.api.transit.type.group.TypeGroup;
+import net.cshift.transit.network.packet.IStaticPacket;
+import net.cshift.transit.type.group.GroupRegistry;
+import net.cshift.transit.type.group.TypeGroup;
 
 /**
  * @author Kyle Gunger
diff --git a/src/main/java/net/cshift/api/transit/network/INode.java b/src/main/java/net/cshift/transit/network/INode.java
index ad9f1d3..2a6e865 100644
--- a/src/main/java/net/cshift/api/transit/network/INode.java
+++ b/src/main/java/net/cshift/transit/network/INode.java
@@ -1,6 +1,6 @@
-package net.cshift.api.transit.network;
+package net.cshift.transit.network;
 
-import net.cshift.api.transit.network.packet.*;
+import net.cshift.transit.network.packet.*;
 
 /**
  * @author Kyle Gunger
diff --git a/src/main/java/net/cshift/api/transit/network/PoolManifest.java b/src/main/java/net/cshift/transit/network/PoolManifest.java
index e539ee1..bc406fe 100644
--- a/src/main/java/net/cshift/api/transit/network/PoolManifest.java
+++ b/src/main/java/net/cshift/transit/network/PoolManifest.java
@@ -1,4 +1,4 @@
-package net.cshift.api.transit.network;
+package net.cshift.transit.network;
 
 /**
  * @author Kyle Gunger
diff --git a/src/main/java/net/cshift/api/transit/network/packet/DynamicPacket.java b/src/main/java/net/cshift/transit/network/packet/DynamicPacket.java
index 3a57227..beeea97 100644
--- a/src/main/java/net/cshift/api/transit/network/packet/DynamicPacket.java
+++ b/src/main/java/net/cshift/transit/network/packet/DynamicPacket.java
@@ -1,6 +1,6 @@
-package net.cshift.api.transit.network.packet;
+package net.cshift.transit.network.packet;
 
-import net.cshift.api.transit.type.Type;
+import net.cshift.transit.type.Type;
 
 /**
  * Simple packet which stores a value which can change.
diff --git a/src/main/java/net/cshift/api/transit/network/packet/IDynamicPacket.java b/src/main/java/net/cshift/transit/network/packet/IDynamicPacket.java
index 6d80b3b..fca43e5 100644
--- a/src/main/java/net/cshift/api/transit/network/packet/IDynamicPacket.java
+++ b/src/main/java/net/cshift/transit/network/packet/IDynamicPacket.java
@@ -1,4 +1,4 @@
-package net.cshift.api.transit.network.packet;
+package net.cshift.transit.network.packet;
 
 /** Interface describing a packet where the data can change as it's transferred.
  * 
diff --git a/src/main/java/net/cshift/api/transit/network/packet/IStaticPacket.java b/src/main/java/net/cshift/transit/network/packet/IStaticPacket.java
index cdad90a..506a166 100644
--- a/src/main/java/net/cshift/api/transit/network/packet/IStaticPacket.java
+++ b/src/main/java/net/cshift/transit/network/packet/IStaticPacket.java
@@ -1,6 +1,6 @@
-package net.cshift.api.transit.network.packet;
+package net.cshift.transit.network.packet;
 
-import net.cshift.api.transit.type.*;
+import net.cshift.transit.type.*;
 
 /** Interface describing an unchanging packet.
  *
diff --git a/src/main/java/net/cshift/api/transit/network/packet/StaticPacket.java b/src/main/java/net/cshift/transit/network/packet/StaticPacket.java
index 5ffed26..3daefb0 100644
--- a/src/main/java/net/cshift/api/transit/network/packet/StaticPacket.java
+++ b/src/main/java/net/cshift/transit/network/packet/StaticPacket.java
@@ -1,6 +1,6 @@
-package net.cshift.api.transit.network.packet;
+package net.cshift.transit.network.packet;
 
-import net.cshift.api.transit.type.*;
+import net.cshift.transit.type.*;
 
 /** Simple packet which stores an unchanging value.
  * @author Kyle Gunger
diff --git a/src/main/java/net/cshift/api/transit/type/SimpleTypes.java b/src/main/java/net/cshift/transit/type/SimpleTypes.java
index 5b4a6b8..1d3d89e 100644
--- a/src/main/java/net/cshift/api/transit/type/SimpleTypes.java
+++ b/src/main/java/net/cshift/transit/type/SimpleTypes.java
@@ -22,7 +22,7 @@
 	SOFTWARE.
 */
 
-package net.cshift.api.transit.type;
+package net.cshift.transit.type;
 
 public final class SimpleTypes {
 	/** Transfers energy.  Energy is stored as a numeric.
diff --git a/src/main/java/net/cshift/api/transit/type/TFluid.java b/src/main/java/net/cshift/transit/type/TFluid.java
index 522d75c..c979830 100644
--- a/src/main/java/net/cshift/api/transit/type/TFluid.java
+++ b/src/main/java/net/cshift/transit/type/TFluid.java
@@ -1,4 +1,4 @@
-package net.cshift.api.transit.type;
+package net.cshift.transit.type;
 
 import net.minecraft.fluid.*;
 
diff --git a/src/main/java/net/cshift/api/transit/type/TItem.java b/src/main/java/net/cshift/transit/type/TItem.java
index 54a3d23..ad59e9f 100644
--- a/src/main/java/net/cshift/api/transit/type/TItem.java
+++ b/src/main/java/net/cshift/transit/type/TItem.java
@@ -22,7 +22,7 @@
 	SOFTWARE.
 */
 
-package net.cshift.api.transit.type;
+package net.cshift.transit.type;
 
 import net.minecraft.item.*;
 
diff --git a/src/main/java/net/cshift/api/transit/type/TMana.java b/src/main/java/net/cshift/transit/type/TMana.java
index a73e47c..468b04f 100644
--- a/src/main/java/net/cshift/api/transit/type/TMana.java
+++ b/src/main/java/net/cshift/transit/type/TMana.java
@@ -1,4 +1,4 @@
-package net.cshift.api.transit.type;
+package net.cshift.transit.type;
 
 /** Units of mana.
  * @author Kyle Gunger
diff --git a/src/main/java/net/cshift/api/transit/type/Type.java b/src/main/java/net/cshift/transit/type/Type.java
index f544e8f..e7e38b9 100644
--- a/src/main/java/net/cshift/api/transit/type/Type.java
+++ b/src/main/java/net/cshift/transit/type/Type.java
@@ -22,9 +22,9 @@
 	SOFTWARE.
 */
 
-package net.cshift.api.transit.type;
+package net.cshift.transit.type;
 
-import net.cshift.api.transit.network.packet.*;
+import net.cshift.transit.network.packet.*;
 
 /**@author Kyle Gunger
  * 
diff --git a/src/main/java/net/cshift/api/transit/type/group/GroupRegistry.java b/src/main/java/net/cshift/transit/type/group/GroupRegistry.java
index f74e9c5..2c0b592 100644
--- a/src/main/java/net/cshift/api/transit/type/group/GroupRegistry.java
+++ b/src/main/java/net/cshift/transit/type/group/GroupRegistry.java
@@ -22,14 +22,14 @@
 	SOFTWARE.
 */
 
-package net.cshift.api.transit.type.group;
+package net.cshift.transit.type.group;
 
 import java.security.InvalidKeyException;
 import java.util.HashMap;
 
 import org.slf4j.*;
 
-import net.cshift.api.transit.type.Type;
+import net.cshift.transit.type.Type;
 
 public final class GroupRegistry {
 	private static final HashMap<String, TypeGroup<?>> GROUPS = new HashMap<String, TypeGroup<?>>();
diff --git a/src/main/java/net/cshift/api/transit/type/group/SimpleGroups.java b/src/main/java/net/cshift/transit/type/group/SimpleGroups.java
index 3f7d8a1..6046db5 100644
--- a/src/main/java/net/cshift/api/transit/type/group/SimpleGroups.java
+++ b/src/main/java/net/cshift/transit/type/group/SimpleGroups.java
@@ -22,11 +22,11 @@
 	SOFTWARE.
 */
 
-package net.cshift.api.transit.type.group;
+package net.cshift.transit.type.group;
 
 import org.slf4j.*;
 
-import net.cshift.api.transit.type.*;
+import net.cshift.transit.type.*;
 
 public final class SimpleGroups {
 	/** Transfers energy.  Basic unit is TJoule (Transit Joule).
diff --git a/src/main/java/net/cshift/api/transit/type/group/TypeGroup.java b/src/main/java/net/cshift/transit/type/group/TypeGroup.java
index 426f0a8..ee19885 100644
--- a/src/main/java/net/cshift/api/transit/type/group/TypeGroup.java
+++ b/src/main/java/net/cshift/transit/type/group/TypeGroup.java
@@ -22,14 +22,14 @@
 	SOFTWARE.
 */
 
-package net.cshift.api.transit.type.group;
+package net.cshift.transit.type.group;
 
 import java.security.InvalidKeyException;
 import java.util.HashMap;
 
 import org.slf4j.*;
 
-import net.cshift.api.transit.type.Type;
+import net.cshift.transit.type.Type;
 
 /**
  * @author Kyle Gunger