New layout

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

34 files changed, 219 insertions, 128 deletions

diff --git a/LICENSE b/LICENSE
index 6490f86..0e259d4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,21 +1,121 @@
-MIT License
-
-Copyright (c) 2020 Kyle Gunger
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+    HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+     communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+     likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+     subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+     in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+     European Parliament and of the Council of 11 March 1996 on the legal
+     protection of databases, and under any national implementation
+     thereof, including any amended or successor version of such
+     directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+     world based on applicable law or treaty, and any national
+     implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied,
+    statutory or otherwise, including without limitation warranties of
+    title, merchantability, fitness for a particular purpose, non
+    infringement, or the absence of latent or other defects, accuracy, or
+    the present or absence of errors, whether or not discoverable, all to
+    the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without
+    limitation any person's Copyright and Related Rights in the Work.
+    Further, Affirmer disclaims responsibility for obtaining any necessary
+    consents, permissions or other rights required for any use of the
+    Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to
+    this CC0 or use of the Work.
diff --git a/README.md b/README.md
index 873c2b5..fd96346 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,9 @@
-# TransitAPI
-Transit is an attempt to provide simple uniform helpers for converting and transfering abstract types in Minecraft.
+# Fabric Example Mod
 
-Transit makes no assumptions about what you transfer or how you transfer it, It only provides basic types for those that need it, and a network based API for compatibility.
-
-## A note on convention
-When working with blocks, the convention is such:
-1. The BlockEntity will impliment the INode/IAcceptorNode/IProviderNode interfaces.
-2. The Placed block will ask the blocks around it to become a provider and or an acceptor, not the other way around.
+## Setup
 
+For setup instructions please see the [fabric wiki page](https://fabricmc.net/wiki/tutorial:setup) that relates to the IDE that you are using.
 
 ## License
-This mod is available under the MIT licence.
+
+This template is available under the CC0 license. Feel free to learn from it and incorporate it in your own projects.
diff --git a/build.gradle b/build.gradle
index 220d900..62083f9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ version = project.mod_version
 group = project.maven_group
 
 dependencies {
-	//to change the versions see the gradle.properties file
+	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
@@ -31,23 +31,33 @@ processResources {
 	}
 }
 
-// ensure that the encoding is set to UTF-8, no matter what the system default is
-// this fixes some edge cases with special characters not displaying correctly
-// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-tasks.withType(JavaCompile) {
-	options.encoding = "UTF-8"
+tasks.withType(JavaCompile).configureEach {
+	// ensure that the encoding is set to UTF-8, no matter what the system default is
+	// this fixes some edge cases with special characters not displaying correctly
+	// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+	// If Javadoc is generated, this must be specified in that task too.
+	it.options.encoding = "UTF-8"
+
+	// The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
+	// JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
+	// We'll use that if it's available, but otherwise we'll use the older option.
+	def targetVersion = 8
+	if (JavaVersion.current().isJava9Compatible()) {
+		 it.options.release = targetVersion
+	}
 }
 
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
-	classifier = "sources"
-	from sourceSets.main.allSource
+java {
+	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+	// if it is present.
+	// If you remove this line, sources will not be generated.
+	withSourcesJar()
 }
 
 jar {
-	from "LICENSE"
+	from("LICENSE") {
+		rename { "${it}_${project.archivesBaseName}"}
+	}
 }
 
 // configure the maven publication
@@ -64,9 +74,9 @@ publishing {
 		}
 	}
 
-	// select the repositories you want to publish to
+	// Select the repositories you want to publish to
+	// To publish to maven local, no extra repositories are necessary. Just use the task `publishToMavenLocal`.
 	repositories {
-		// uncomment to publish to the local maven
-		// mavenLocal()
+		// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
 	}
 }
diff --git a/gradle.properties b/gradle.properties
index 002da7b..d82678b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.16.3
-	yarn_mappings=1.16.3+build.17
-	loader_version=0.10.0+build.208
+	minecraft_version=1.16.4
+	yarn_mappings=1.16.4+build.6
+	loader_version=0.10.6+build.214
 
 # Mod Properties
-	mod_version = 0.13.0
-	maven_group = net.corechg.mc
+	mod_version = 0.14.0
+	maven_group = net.corechg
 	archives_base_name = transit-api
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.22.0+build.408-1.16
+	fabric_version=0.25.1+build.416-1.16
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 62d4c05..e708b1c 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 12d38de..be52383 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index fbd7c51..4f906e0 100755
--- a/gradlew
+++ b/gradlew
@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
diff --git a/gradlew.bat b/gradlew.bat
index 5093609..107acd3 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,21 +64,6 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
@@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
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"
   }
 }