New layout

~ Switch from net.corechg.mc to net.corechg
~ Update to newer build system

26 files changed, 56 insertions, 56 deletions

diff --git a/src/main/java/net/corechg/mc/transit/Transit.java b/src/main/java/net/corechg/transit/Transit.java
index 36b60bf..3cf4917 100644
--- a/src/main/java/net/corechg/mc/transit/Transit.java
+++ b/src/main/java/net/corechg/transit/Transit.java
@@ -1,7 +1,7 @@
-package net.corechg.mc.transit;
+package net.corechg.transit;
 
 import net.fabricmc.api.ModInitializer;
-import net.corechg.mc.transit.type.group.simple.SimpleGroups;
+import net.corechg.transit.type.group.simple.SimpleGroups;
 
 public class Transit implements ModInitializer {
 	
diff --git a/src/main/java/net/corechg/mc/transit/basic/AbstractAcceptorNode.java b/src/main/java/net/corechg/transit/basic/AbstractAcceptorNode.java
index d569557..eafc71e 100644
--- a/src/main/java/net/corechg/mc/transit/basic/AbstractAcceptorNode.java
+++ b/src/main/java/net/corechg/transit/basic/AbstractAcceptorNode.java
@@ -1,8 +1,8 @@
-package net.corechg.mc.transit.basic;
+package net.corechg.transit.basic;
 
-import net.corechg.mc.transit.network.packet.IStaticPacket;
-import net.corechg.mc.transit.network.system.Connection;
-import net.corechg.mc.transit.network.system.swap.*;
+import net.corechg.transit.network.packet.IStaticPacket;
+import net.corechg.transit.network.system.Connection;
+import net.corechg.transit.network.system.swap.*;
 import net.minecraft.block.entity.BlockEntityType;
 
 public abstract class AbstractAcceptorNode extends AbstractNode implements IAcceptorNode {
diff --git a/src/main/java/net/corechg/mc/transit/basic/AbstractNode.java b/src/main/java/net/corechg/transit/basic/AbstractNode.java
index 01c537c..9c66951 100644
--- a/src/main/java/net/corechg/mc/transit/basic/AbstractNode.java
+++ b/src/main/java/net/corechg/transit/basic/AbstractNode.java
@@ -1,8 +1,8 @@
-package net.corechg.mc.transit.basic;
+package net.corechg.transit.basic;
 
 import java.util.*;
 
-import net.corechg.mc.transit.network.system.*;
+import net.corechg.transit.network.system.*;
 import net.minecraft.block.entity.*;
 
 public abstract class AbstractNode extends BlockEntity implements INode {
diff --git a/src/main/java/net/corechg/mc/transit/basic/AbstractProviderNode.java b/src/main/java/net/corechg/transit/basic/AbstractProviderNode.java
index 7ddc41b..f57c397 100644
--- a/src/main/java/net/corechg/mc/transit/basic/AbstractProviderNode.java
+++ b/src/main/java/net/corechg/transit/basic/AbstractProviderNode.java
@@ -1,7 +1,7 @@
-package net.corechg.mc.transit.basic;
+package net.corechg.transit.basic;
 
-import net.corechg.mc.transit.network.system.Connection;
-import net.corechg.mc.transit.network.system.swap.*;
+import net.corechg.transit.network.system.Connection;
+import net.corechg.transit.network.system.swap.*;
 import net.minecraft.block.entity.BlockEntityType;
 
 public abstract class AbstractProviderNode extends AbstractNode implements IProviderNode {
diff --git a/src/main/java/net/corechg/mc/transit/basic/AbstractTwoWayNode.java b/src/main/java/net/corechg/transit/basic/AbstractTwoWayNode.java
index 1d37245..1fa90af 100644
--- a/src/main/java/net/corechg/mc/transit/basic/AbstractTwoWayNode.java
+++ b/src/main/java/net/corechg/transit/basic/AbstractTwoWayNode.java
@@ -1,7 +1,7 @@
-package net.corechg.mc.transit.basic;
+package net.corechg.transit.basic;
 
-import net.corechg.mc.transit.network.system.Connection;
-import net.corechg.mc.transit.network.system.swap.*;
+import net.corechg.transit.network.system.Connection;
+import net.corechg.transit.network.system.swap.*;
 import net.minecraft.block.entity.BlockEntityType;
 
 public abstract class AbstractTwoWayNode extends AbstractAcceptorNode implements IProviderNode {
diff --git a/src/main/java/net/corechg/mc/transit/basic/system/AbstractSystem.java b/src/main/java/net/corechg/transit/basic/system/AbstractSystem.java
index 637a072..0d1c147 100644
--- a/src/main/java/net/corechg/mc/transit/basic/system/AbstractSystem.java
+++ b/src/main/java/net/corechg/transit/basic/system/AbstractSystem.java
@@ -1,6 +1,6 @@
-package net.corechg.mc.transit.basic.system;
+package net.corechg.transit.basic.system;
 
-import net.corechg.mc.transit.network.system.*;
+import net.corechg.transit.network.system.*;
 
 public abstract class AbstractSystem implements ISystem {
 
diff --git a/src/main/java/net/corechg/mc/transit/basic/system/AbstractSystemNode.java b/src/main/java/net/corechg/transit/basic/system/AbstractSystemNode.java
index c65c6a2..642b0e4 100644
--- a/src/main/java/net/corechg/mc/transit/basic/system/AbstractSystemNode.java
+++ b/src/main/java/net/corechg/transit/basic/system/AbstractSystemNode.java
@@ -1,6 +1,6 @@
-package net.corechg.mc.transit.basic.system;
+package net.corechg.transit.basic.system;
 
-import net.corechg.mc.transit.basic.*;
+import net.corechg.transit.basic.*;
 import net.minecraft.block.entity.BlockEntityType;
 
 public abstract class AbstractSystemNode extends AbstractNode {
diff --git a/src/main/java/net/corechg/mc/transit/network/packet/IStaticPacket.java b/src/main/java/net/corechg/transit/network/packet/IStaticPacket.java
index 27dd3fb..74d5110 100644
--- a/src/main/java/net/corechg/mc/transit/network/packet/IStaticPacket.java
+++ b/src/main/java/net/corechg/transit/network/packet/IStaticPacket.java
@@ -1,6 +1,6 @@
-package net.corechg.mc.transit.network.packet;
+package net.corechg.transit.network.packet;
 
-import net.corechg.mc.transit.type.Type;
+import net.corechg.transit.type.Type;
 
 /** Interface describing an unchanging packet.
  * @author Kyle Gunger
diff --git a/src/main/java/net/corechg/mc/transit/network/packet/MetaPacket.java b/src/main/java/net/corechg/transit/network/packet/MetaPacket.java
index 3195198..e043aa1 100644
--- a/src/main/java/net/corechg/mc/transit/network/packet/MetaPacket.java
+++ b/src/main/java/net/corechg/transit/network/packet/MetaPacket.java
@@ -1,6 +1,6 @@
-package net.corechg.mc.transit.network.packet;
+package net.corechg.transit.network.packet;
 
-import net.corechg.mc.transit.type.Type;
+import net.corechg.transit.type.Type;
 
 /** Static packet with extra data attached.
  * @author Kyle Gunger
diff --git a/src/main/java/net/corechg/mc/transit/network/packet/StaticPacket.java b/src/main/java/net/corechg/transit/network/packet/StaticPacket.java
index cf37b02..2596a8f 100644
--- a/src/main/java/net/corechg/mc/transit/network/packet/StaticPacket.java
+++ b/src/main/java/net/corechg/transit/network/packet/StaticPacket.java
@@ -1,6 +1,6 @@
-package net.corechg.mc.transit.network.packet;
+package net.corechg.transit.network.packet;
 
-import net.corechg.mc.transit.type.Type;
+import net.corechg.transit.type.Type;
 
 /** Simple packet which stores an unchanging value.
  * @author Kyle Gunger
diff --git a/src/main/java/net/corechg/mc/transit/network/packet/dynamic/DynamicPacket.java b/src/main/java/net/corechg/transit/network/packet/dynamic/DynamicPacket.java
index e59a762..73f3669 100644
--- a/src/main/java/net/corechg/mc/transit/network/packet/dynamic/DynamicPacket.java
+++ b/src/main/java/net/corechg/transit/network/packet/dynamic/DynamicPacket.java
@@ -1,6 +1,6 @@
-package net.corechg.mc.transit.network.packet.dynamic;
+package net.corechg.transit.network.packet.dynamic;
 
-import net.corechg.mc.transit.type.Type;
+import net.corechg.transit.type.Type;
 
 /**
  * Simple packet which stores a fluid value.
diff --git a/src/main/java/net/corechg/mc/transit/network/packet/dynamic/IDynamicPacket.java b/src/main/java/net/corechg/transit/network/packet/dynamic/IDynamicPacket.java
index 096d289..6cf3018 100644
--- a/src/main/java/net/corechg/mc/transit/network/packet/dynamic/IDynamicPacket.java
+++ b/src/main/java/net/corechg/transit/network/packet/dynamic/IDynamicPacket.java
@@ -1,6 +1,6 @@
-package net.corechg.mc.transit.network.packet.dynamic;
+package net.corechg.transit.network.packet.dynamic;
 
-import net.corechg.mc.transit.network.packet.IStaticPacket;
+import net.corechg.transit.network.packet.IStaticPacket;
 
 /** Interface describing a fluid packet.
  * @author Kyle Gunger
diff --git a/src/main/java/net/corechg/mc/transit/network/packet/dynamic/MetaDynamicPacket.java b/src/main/java/net/corechg/transit/network/packet/dynamic/MetaDynamicPacket.java
index fd4c24d..50418b9 100644
--- a/src/main/java/net/corechg/mc/transit/network/packet/dynamic/MetaDynamicPacket.java
+++ b/src/main/java/net/corechg/transit/network/packet/dynamic/MetaDynamicPacket.java
@@ -1,6 +1,6 @@
-package net.corechg.mc.transit.network.packet.dynamic;
+package net.corechg.transit.network.packet.dynamic;
 
-import net.corechg.mc.transit.type.Type;
+import net.corechg.transit.type.Type;
 
 /** Static packet with extra data attached.
  * @author Kyle Gunger
diff --git a/src/main/java/net/corechg/mc/transit/network/system/Connection.java b/src/main/java/net/corechg/transit/network/system/Connection.java
index bb53f93..5e34895 100644
--- a/src/main/java/net/corechg/mc/transit/network/system/Connection.java
+++ b/src/main/java/net/corechg/transit/network/system/Connection.java
@@ -1,4 +1,4 @@
-package net.corechg.mc.transit.network.system;
+package net.corechg.transit.network.system;
 
 public class Connection {
     INode node;
diff --git a/src/main/java/net/corechg/mc/transit/network/system/INode.java b/src/main/java/net/corechg/transit/network/system/INode.java
index 71733e6..6be7d27 100644
--- a/src/main/java/net/corechg/mc/transit/network/system/INode.java
+++ b/src/main/java/net/corechg/transit/network/system/INode.java
@@ -1,4 +1,4 @@
-package net.corechg.mc.transit.network.system;
+package net.corechg.transit.network.system;
 
 /**
  * @author Kyle Gunger
diff --git a/src/main/java/net/corechg/mc/transit/network/system/ISystem.java b/src/main/java/net/corechg/transit/network/system/ISystem.java
index 0ebb656..693a3ed 100644
--- a/src/main/java/net/corechg/mc/transit/network/system/ISystem.java
+++ b/src/main/java/net/corechg/transit/network/system/ISystem.java
@@ -1,4 +1,4 @@
-package net.corechg.mc.transit.network.system;
+package net.corechg.transit.network.system;
 
 
 /**
diff --git a/src/main/java/net/corechg/mc/transit/network/system/swap/IAcceptorNode.java b/src/main/java/net/corechg/transit/network/system/swap/IAcceptorNode.java
index 61f6022..5214d03 100644
--- a/src/main/java/net/corechg/mc/transit/network/system/swap/IAcceptorNode.java
+++ b/src/main/java/net/corechg/transit/network/system/swap/IAcceptorNode.java
@@ -1,7 +1,7 @@
-package net.corechg.mc.transit.network.system.swap;
+package net.corechg.transit.network.system.swap;
 
-import net.corechg.mc.transit.network.packet.IStaticPacket;
-import net.corechg.mc.transit.network.system.INode;
+import net.corechg.transit.network.packet.IStaticPacket;
+import net.corechg.transit.network.system.INode;
 
 /**
  * @author Kyle Gunger
diff --git a/src/main/java/net/corechg/mc/transit/network/system/swap/IProviderNode.java b/src/main/java/net/corechg/transit/network/system/swap/IProviderNode.java
index 62a45b7..b40030e 100644
--- a/src/main/java/net/corechg/mc/transit/network/system/swap/IProviderNode.java
+++ b/src/main/java/net/corechg/transit/network/system/swap/IProviderNode.java
@@ -1,6 +1,6 @@
-package net.corechg.mc.transit.network.system.swap;
+package net.corechg.transit.network.system.swap;
 
-import net.corechg.mc.transit.network.system.INode;
+import net.corechg.transit.network.system.INode;
 
 /**
  * @author Kyle Gunger
diff --git a/src/main/java/net/corechg/mc/transit/type/TFluid.java b/src/main/java/net/corechg/transit/type/TFluid.java
index 9f00a9b..6886ab2 100644
--- a/src/main/java/net/corechg/mc/transit/type/TFluid.java
+++ b/src/main/java/net/corechg/transit/type/TFluid.java
@@ -1,4 +1,4 @@
-package net.corechg.mc.transit.type;
+package net.corechg.transit.type;
 
 import net.minecraft.fluid.Fluid;
 
diff --git a/src/main/java/net/corechg/mc/transit/type/TMana.java b/src/main/java/net/corechg/transit/type/TMana.java
index 16983b7..7a2e9f8 100644
--- a/src/main/java/net/corechg/mc/transit/type/TMana.java
+++ b/src/main/java/net/corechg/transit/type/TMana.java
@@ -1,4 +1,4 @@
-package net.corechg.mc.transit.type;
+package net.corechg.transit.type;
 
 /** Units of mana.
  * @author Kyle Gunger
diff --git a/src/main/java/net/corechg/mc/transit/type/Type.java b/src/main/java/net/corechg/transit/type/Type.java
index 7ac670e..9fb79f5 100644
--- a/src/main/java/net/corechg/mc/transit/type/Type.java
+++ b/src/main/java/net/corechg/transit/type/Type.java
@@ -1,6 +1,6 @@
-package net.corechg.mc.transit.type;
+package net.corechg.transit.type;
 
-import net.corechg.mc.transit.network.packet.*;
+import net.corechg.transit.network.packet.*;
 
 /**@author Kyle Gunger
  * 
diff --git a/src/main/java/net/corechg/mc/transit/type/group/GroupRegistry.java b/src/main/java/net/corechg/transit/type/group/GroupRegistry.java
index 2d0d17f..d811770 100644
--- a/src/main/java/net/corechg/mc/transit/type/group/GroupRegistry.java
+++ b/src/main/java/net/corechg/transit/type/group/GroupRegistry.java
@@ -1,11 +1,11 @@
-package net.corechg.mc.transit.type.group;
+package net.corechg.transit.type.group;
 
 import java.util.ArrayList;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import net.corechg.mc.transit.type.Type;
+import net.corechg.transit.type.Type;
 
 public final class GroupRegistry {
 	private static final ArrayList<TypeGroup<?>> GROUPS = new ArrayList<TypeGroup<?>>(0);
diff --git a/src/main/java/net/corechg/mc/transit/type/group/TypeGroup.java b/src/main/java/net/corechg/transit/type/group/TypeGroup.java
index 4717119..eecf6d4 100644
--- a/src/main/java/net/corechg/mc/transit/type/group/TypeGroup.java
+++ b/src/main/java/net/corechg/transit/type/group/TypeGroup.java
@@ -1,12 +1,12 @@
-package net.corechg.mc.transit.type.group;
+package net.corechg.transit.type.group;
 
 import java.util.ArrayList;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import net.corechg.mc.transit.network.packet.*;
-import net.corechg.mc.transit.type.Type;
+import net.corechg.transit.network.packet.*;
+import net.corechg.transit.type.Type;
 
 /**
  * @author Kyle Gunger
diff --git a/src/main/java/net/corechg/mc/transit/type/group/simple/SimpleGroups.java b/src/main/java/net/corechg/transit/type/group/simple/SimpleGroups.java
index 73e0df7..d45970d 100644
--- a/src/main/java/net/corechg/mc/transit/type/group/simple/SimpleGroups.java
+++ b/src/main/java/net/corechg/transit/type/group/simple/SimpleGroups.java
@@ -1,9 +1,9 @@
-package net.corechg.mc.transit.type.group.simple;
+package net.corechg.transit.type.group.simple;
 
 import net.minecraft.item.ItemStack;
-import net.corechg.mc.transit.type.group.*;
-import net.corechg.mc.transit.type.simple.SimpleTypes;
-import net.corechg.mc.transit.type.*;
+import net.corechg.transit.type.group.*;
+import net.corechg.transit.type.simple.SimpleTypes;
+import net.corechg.transit.type.*;
 
 public final class SimpleGroups {
 	/** Transfers energy.  Basic unit is TJoule (Transit Joule).
diff --git a/src/main/java/net/corechg/mc/transit/type/simple/SimpleTypes.java b/src/main/java/net/corechg/transit/type/simple/SimpleTypes.java
index 79ee9a8..f608bdd 100644
--- a/src/main/java/net/corechg/mc/transit/type/simple/SimpleTypes.java
+++ b/src/main/java/net/corechg/transit/type/simple/SimpleTypes.java
@@ -1,7 +1,7 @@
-package net.corechg.mc.transit.type.simple;
+package net.corechg.transit.type.simple;
 
 import net.minecraft.item.ItemStack;
-import net.corechg.mc.transit.type.*;
+import net.corechg.transit.type.*;
 
 public final class SimpleTypes {
 	/** Transfers energy.  Energy is stored as a numeric, base value is TJoule (TransitJoule)
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 409db16..f3f38ce 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "id": "transit-api",
-  "version": "0.13.0",
+  "version": "0.14.0",
 
   "name": "Transit API",
   "description": "Move things about!",
@@ -20,12 +20,12 @@
   "environment": "*",
   "entrypoints": {
     "main": [
-      "net.corechg.mc.transit.Transit"
+      "net.corechg.transit.Transit"
     ]
   },
 
   "depends": {
-    "fabricloader": ">=0.9",
+    "fabricloader": ">=0.7.4",
     "minecraft": "1.16.x"
   }
 }