diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
new file mode 100644
index 0000000..f4e30c1
--- /dev/null
+++ b/.github/workflows/pull-request.yml
@@ -0,0 +1,32 @@
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Build pull request
+
+on:
+  pull_request:
+    branches: [ master, main ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with: 
+        fetch-depth: 0
+    
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: '8'
+        distribution: 'adopt'
+        cache: gradle
+        
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+
+    - name: Setup the workspace
+      run: ./gradlew setupCIWorkspace
+    
+    - name: Build the mod
+      run: ./gradlew build
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..6a64794
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,41 @@
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Build and release main branch
+
+on:
+  push:
+    branches: [ master, main ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with: 
+        fetch-depth: 0
+    
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: '8'
+        distribution: 'adopt'
+        cache: gradle
+        
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+
+    - name: Setup the workspace
+      run: ./gradlew setupCIWorkspace
+    
+    - name: Build the mod
+      run: ./gradlew build
+        
+    - uses: "marvinpinto/action-automatic-releases@latest"
+      with:
+        repo_token: "${{ secrets.GITHUB_TOKEN }}"
+        automatic_release_tag: "latest"
+        prerelease: true
+        title: "Latest Development Build"
+        files: build/libs/*.jar
+            
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4a0ea1e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,29 @@
+.gradle
+.settings
+/.idea/
+/run/
+/build/
+/eclipse/
+.classpath
+.project
+/bin/
+/config/
+/crash-reports/
+/logs/
+options.txt
+/saves/
+usernamecache.json
+banned-ips.json
+banned-players.json
+eula.txt
+ops.json
+server.properties
+servers.dat
+usercache.json
+whitelist.json
+world/
+/out/
+*.iml
+*.ipr
+*.iws
+src/main/resources/mixins.*.json
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..7fe18ad
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,526 @@
+//version: 21647c763d3f6c90d59c900edae1248239c49dfb
+/*
+DO NOT CHANGE THIS FILE!
+
+Also, you may replace this file at any time if there is an update available.
+Please check https://github.com/SinTh0r4s/ExampleMod1.7.10/blob/main/build.gradle for updates.
+ */
+
+
+import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
+
+import java.util.concurrent.TimeUnit
+
+buildscript {
+    repositories {
+        maven {
+            name = "jitpack"
+            url = "https://jitpack.io"
+        }
+        maven {
+            name = "forge"
+            url = "https://maven.minecraftforge.net"
+        }
+        maven {
+            name = "sonatype"
+            url = "https://oss.sonatype.org/content/repositories/snapshots/"
+        }
+        maven {
+            name = "Scala CI dependencies"
+            url = "https://repo1.maven.org/maven2/"
+        }
+    }
+    dependencies {
+        classpath 'com.github.TheElan:ForgeGradle:1.2.2'
+    }
+}
+
+plugins {
+    id("org.ajoberstar.grgit") version("3.1.1")
+    id("com.github.johnrengelman.shadow") version("4.0.4")
+    id("com.palantir.git-version") version("0.12.3")
+}
+
+apply plugin: 'scala'
+apply plugin: 'forge'
+apply plugin: 'idea'
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(8))
+    }
+}
+
+idea {
+    module {
+        inheritOutputDirs = true
+        downloadJavadoc = true
+        downloadSources = true
+    }
+}
+
+checkPropertyExists("modName")
+checkPropertyExists("modId")
+checkPropertyExists("modGroup")
+checkPropertyExists("autoUpdateBuildScript")
+checkPropertyExists("minecraftVersion")
+checkPropertyExists("forgeVersion")
+checkPropertyExists("replaceGradleTokenInFile")
+checkPropertyExists("gradleTokenModId")
+checkPropertyExists("gradleTokenModName")
+checkPropertyExists("gradleTokenVersion")
+checkPropertyExists("gradleTokenGroupName")
+checkPropertyExists("apiPackage")
+checkPropertyExists("accessTransformersFile")
+checkPropertyExists("usesMixins")
+checkPropertyExists("mixinPlugin")
+checkPropertyExists("mixinsPackage")
+checkPropertyExists("coreModClass")
+checkPropertyExists("containsMixinsAndOrCoreModOnly")
+checkPropertyExists("usesShadowedDependencies")
+checkPropertyExists("developmentEnvironmentUserName")
+
+def checkPropertyExists(String propertyName) {
+    if (project.hasProperty(propertyName) == false) {
+        throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/SinTh0r4s/ExampleMod1.7.10/blob/main/gradle.properties")
+    }
+}
+
+
+String javaSourceDir = "src/main/java/"
+String scalaSourceDir = "src/main/scala/"
+
+String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/")
+String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/")
+if((new File(targetPackageJava).exists() || new File(targetPackageScala).exists()) == false) {
+    throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
+}
+
+if(apiPackage) {
+    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
+    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
+    if((new File(targetPackageJava).exists() || new File(targetPackageScala).exists()) == false) {
+        throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
+    }
+}
+
+if(accessTransformersFile) {
+    String targetFile = "src/main/resources/META-INF/" + accessTransformersFile
+    if(new File(targetFile).exists() == false) {
+        throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
+    }
+}
+
+if(usesMixins.toBoolean()) {
+    if(mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) {
+        throw new GradleException("\"mixinPlugin\" requires \"mixinsPackage\" and \"mixinPlugin\" to be set!")
+    }
+
+    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
+    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
+    if((new File(targetPackageJava).exists() || new File(targetPackageScala).exists()) == false) {
+        throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
+    }
+
+    String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
+    String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".scala"
+    String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
+    if((new File(targetFileJava).exists() || new File(targetFileScala).exists() || new File(targetFileScalaJava).exists()) == false) {
+        throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava)
+    }
+}
+
+if(coreModClass) {
+    String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
+    String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".scala"
+    String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
+    if((new File(targetFileJava).exists() || new File(targetFileScala).exists() || new File(targetFileScalaJava).exists()) == false) {
+        throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava)
+    }
+}
+
+configurations.all {
+    resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS)
+
+    // Make sure GregTech build won't time out
+    System.setProperty("org.gradle.internal.http.connectionTimeout", 120000 as String)
+    System.setProperty("org.gradle.internal.http.socketTimeout", 120000 as String)
+}
+
+// Fix Jenkins' Git: chmod a file should not be detected as a change and append a '.dirty' to the version
+'git config core.fileMode false'.execute()
+// Pulls version from git tag
+version = minecraftVersion + "-" + gitVersion()
+group = modGroup
+archivesBaseName = modId
+
+minecraft {
+    version = minecraftVersion + "-" + forgeVersion + "-" + minecraftVersion
+    runDir = "run"
+
+    if (replaceGradleTokenInFile) {
+        replaceIn replaceGradleTokenInFile
+        if(gradleTokenModId) {
+            replace gradleTokenModId, modId
+        }
+        if(gradleTokenModName) {
+            replace gradleTokenModName, modName
+        }
+        if(gradleTokenModName) {
+            replace gradleTokenVersion, versionDetails().lastTag
+        }
+        if(gradleTokenGroupName) {
+            replace gradleTokenGroupName, modGroup
+        }
+    }
+}
+
+if(file("addon.gradle").exists()) {
+    apply from: "addon.gradle"
+}
+
+apply from: 'repositories.gradle'
+
+configurations {
+    implementation.extendsFrom(shadowImplementation)
+}
+
+repositories {
+    if(usesMixins.toBoolean()) {
+        maven {
+            name = "sponge"
+            url = "https://repo.spongepowered.org/repository/maven-public"
+        }
+        maven {
+            url = "https://jitpack.io"
+        }
+    }
+}
+
+dependencies {
+    if(usesMixins.toBoolean()) {
+        annotationProcessor("org.ow2.asm:asm-debug-all:5.0.3")
+        annotationProcessor("com.google.guava:guava:24.1.1-jre")
+        annotationProcessor("com.google.code.gson:gson:2.8.6")
+        annotationProcessor("org.spongepowered:mixin:0.8-SNAPSHOT")
+        // using 0.8 to workaround a issue in 0.7 which fails mixin application
+        compile("org.spongepowered:mixin:0.7.11-SNAPSHOT") {
+            // Mixin includes a lot of dependencies that are too up-to-date
+            exclude module: "launchwrapper"
+            exclude module: "guava"
+            exclude module: "gson"
+            exclude module: "commons-io"
+            exclude module: "log4j-core"
+        }
+        compile("com.github.GTNewHorizons:SpongeMixins:1.3.3:dev")
+    }
+}
+
+apply from: 'dependencies.gradle'
+
+task relocateShadowJar(type: ConfigureShadowRelocation) {
+    target = tasks.shadowJar
+    prefix = modGroup + ".shadow"
+}
+
+def mixinConfigJson = "mixins." + modId + ".json"
+def mixingConfigRefMap = "mixins." + modId + ".refmap.json"
+def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + mixingConfigRefMap
+def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg"
+
+task generateAssets {
+    if(usesMixins.toBoolean()) {
+        new File(projectDir.toString() + "/src/main/resources/", mixinConfigJson).text = """{
+  "required": true,
+  "minVersion": "0.7.11",
+  "package": "${modGroup}.${mixinsPackage}",
+  "plugin": "${modGroup}.${mixinPlugin}",
+  "refmap": "${mixingConfigRefMap}",
+  "target": "@env(DEFAULT)",
+  "compatibilityLevel": "JAVA_8"
+}
+
+"""
+    }
+}
+
+shadowJar {
+    def manifestAttributes = [:]
+    if(containsMixinsAndOrCoreModOnly.toBoolean() == false) {
+        manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
+    }
+
+    if(accessTransformersFile) {
+        manifestAttributes += ["FMLAT" : accessTransformersFile.toString()]
+    }
+
+    if(coreModClass) {
+        manifestAttributes += ["FMLCorePlugin": modGroup + "." + coreModClass]
+    }
+
+    if(usesMixins.toBoolean()) {
+        from refMap
+        manifestAttributes += [
+                "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
+                "MixinConfigs" : mixinConfigJson,
+                "ForceLoadAsMod" : containsMixinsAndOrCoreModOnly.toBoolean() == false
+        ]
+    }
+    manifest {
+        attributes(manifestAttributes)
+    }
+
+    minimize()
+    configurations = [project.configurations.shadowImplementation]
+    dependsOn(relocateShadowJar)
+}
+
+jar {
+    def manifestAttributes = [:]
+    if(containsMixinsAndOrCoreModOnly.toBoolean() == false) {
+        manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
+    }
+
+    if(accessTransformersFile) {
+        manifestAttributes += ["FMLAT" : accessTransformersFile.toString()]
+    }
+
+    if(coreModClass) {
+        manifestAttributes += ["FMLCorePlugin": modGroup + "." + coreModClass]
+    }
+
+    if(usesMixins.toBoolean()) {
+        from refMap
+        manifestAttributes += [
+                "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
+                "MixinConfigs" : mixinConfigJson,
+                "ForceLoadAsMod" : containsMixinsAndOrCoreModOnly.toBoolean() == false
+        ]
+    }
+    manifest {
+        attributes(manifestAttributes)
+    }
+
+    if(usesShadowedDependencies.toBoolean()) {
+        dependsOn(shadowJar)
+        enabled = false
+    }
+}
+
+reobf {
+    if(usesMixins.toBoolean()) {
+        addExtraSrgFile mixinSrg
+    }
+}
+
+afterEvaluate {
+    if(usesMixins.toBoolean()) {
+        tasks.compileJava {
+            options.compilerArgs += [
+                    "-AreobfSrgFile=${tasks.reobf.srg}",
+                    "-AoutSrgFile=${mixinSrg}",
+                    "-AoutRefMapFile=${refMap}",
+                    // Elan: from what I understand they are just some linter configs so you get some warning on how to properly code
+                    "-XDenableSunApiLintControl",
+                    "-XDignore.symbol.file"
+            ]
+        }
+    }
+}
+
+runClient {
+    def arguments = []
+
+    if(usesMixins.toBoolean()) {
+        arguments += [
+                "--mods=../build/libs/$modId-${version}.jar",
+                "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
+        ]
+    }
+
+    if(developmentEnvironmentUserName) {
+        arguments += [
+                "--username",
+                developmentEnvironmentUserName
+        ]
+    }
+
+    args(arguments)
+}
+
+runServer {
+    def arguments = []
+
+    if(usesMixins.toBoolean()) {
+        arguments += [
+                "--mods=../build/libs/$modId-${version}.jar",
+                "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
+        ]
+    }
+
+    args(arguments)
+}
+
+processResources
+{
+    // this will ensure that this task is redone when the versions change.
+    inputs.property "version", project.version
+    inputs.property "mcversion", project.minecraft.version
+
+    // replace stuff in mcmod.info, nothing else
+    from(sourceSets.main.resources.srcDirs) {
+        include 'mcmod.info'
+
+        // replace version and mcversion
+        expand "minecraftVersion": project.minecraft.version,
+                "modVersion": versionDetails().lastTag,
+                "modId": modId,
+                "modName": modName
+    }
+
+    // copy everything else, thats not the mcmod.info
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
+    }
+}
+
+task sourcesJar(type: Jar) {
+    from (sourceSets.main.allJava)
+    from (file("$projectDir/LICENSE"))
+    getArchiveClassifier().set('sources')
+
+    def manifestAttributes = [:]
+    if(containsMixinsAndOrCoreModOnly.toBoolean() == false) {
+        manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
+    }
+
+    if(accessTransformersFile) {
+        manifestAttributes += ["FMLAT" : accessTransformersFile.toString()]
+    }
+
+    if(coreModClass) {
+        manifestAttributes += ["FMLCorePlugin": modGroup + "." + coreModClass]
+    }
+
+    if(usesMixins.toBoolean()) {
+        from refMap
+        manifestAttributes += [
+                "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
+                "MixinConfigs" : mixinConfigJson,
+                "ForceLoadAsMod" : containsMixinsAndOrCoreModOnly.toBoolean() == false
+        ]
+    }
+    manifest {
+        attributes(manifestAttributes)
+    }
+}
+
+task devJar(type: Jar) {
+    from sourceSets.main.output
+    getArchiveClassifier().set("dev")
+
+    def manifestAttributes = [:]
+    if(containsMixinsAndOrCoreModOnly.toBoolean() == false) {
+        manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
+    }
+
+    if(accessTransformersFile) {
+        manifestAttributes += ["FMLAT" : accessTransformersFile.toString()]
+    }
+
+    if(coreModClass) {
+        manifestAttributes += ["FMLCorePlugin": modGroup + "." + coreModClass]
+    }
+
+    if(usesMixins.toBoolean()) {
+        from refMap
+        manifestAttributes += [
+                "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
+                "MixinConfigs" : mixinConfigJson,
+                "ForceLoadAsMod" : containsMixinsAndOrCoreModOnly.toBoolean() == false
+        ]
+    }
+    manifest {
+        attributes(manifestAttributes)
+    }
+}
+
+task apiJar(type: Jar) {
+    from (sourceSets.main.allJava) {
+        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString() + '/**'
+    }
+
+    from (sourceSets.main.output) {
+        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString() + '/**'
+    }
+
+    from (sourceSets.main.resources.srcDirs) {
+        include("LICENSE")
+    }
+
+    getArchiveClassifier().set('api')
+}
+
+artifacts {
+    archives sourcesJar
+    archives devJar
+    if(apiPackage) {
+        archives apiJar
+    }
+}
+
+// Updating
+task updateBuildScript {
+    doLast {
+        if (updateBuildScript()) return
+
+        print("Build script already up-to-date!")
+    }
+}
+
+if (isNewBuildScriptVersionAvailable()) {
+    if (autoUpdateBuildScript.toBoolean()) {
+        updateBuildScript()
+    } else {
+        println("Build script update available! Run 'gradle updateBuildScript'")
+    }
+}
+
+static URL availableBuildScriptUrl() {
+    new URL("https://raw.githubusercontent.com/SinTh0r4s/ExampleMod1.7.10/main/build.gradle")
+}
+
+static boolean updateBuildScript() {
+    if (isNewBuildScriptVersionAvailable()) {
+        def buildscriptFile = new File("build.gradle")
+        availableBuildScriptUrl().withInputStream { i -> buildscriptFile.withOutputStream { it << i } }
+        print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
+        return true
+    }
+    return false
+}
+
+static boolean isNewBuildScriptVersionAvailable() {
+    Map parameters = ["connectTimeout": 2000, "readTimeout": 2000]
+
+    String currentBuildScript = new File("build.gradle").getText()
+    String currentBuildScriptHash = getVersionHash(currentBuildScript)
+    String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText()
+    String availableBuildScriptHash = getVersionHash(availableBuildScript)
+
+    boolean isUpToDate = currentBuildScriptHash.empty || availableBuildScriptHash.empty || currentBuildScriptHash == availableBuildScriptHash
+    return !isUpToDate
+}
+
+static String getVersionHash(String buildScriptContent) {
+    String versionLine = buildScriptContent.find("^//version: [a-z0-9]*")
+    if(versionLine != null) {
+        return versionLine.split(": ").last()
+    }
+    return ""
+}
+
+configure(updateBuildScript) {
+    group = 'forgegradle'
+    description = 'Updates the build script to the latest version'
+}
diff --git a/build/build.gradle b/build/build.gradle
deleted file mode 100644
index 84ce131..0000000
--- a/build/build.gradle
+++ /dev/null
@@ -1,152 +0,0 @@
-// This sets us up for building a forge project - you need all of these
-buildscript {
-    repositories {
-        mavenCentral()
-        maven {
-            name = "forge"
-            url = "http://files.minecraftforge.net/maven"
-        }
-        maven {
-            name = "sonatype"
-            url = "https://oss.sonatype.org/content/repositories/snapshots/"
-        }
-    }
-    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
-    }
-}
-
-// Apply the forge plugin - this adds all the magic for automatically obfuscating, deobfuscating etc
-apply plugin: 'forge'
-
-// This is our group
-group = "codechicken" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-// This is our actual project within the group.
-archivesBaseName = "CodeChickenLib"
-
-// Define properties file
-ext.configFile = file "build.properties"
-
-configFile.withReader {
-    // Load config.  It shall from now be referenced as simply config or project.config
-    def prop = new Properties()
-    prop.load(it)
-    project.ext.config = new ConfigSlurper().parse prop
-}
-
-version =  "${project.config.mod_version}." + System.getenv("BUILD_NUMBER") ?: "1"
-
-println  config.minecraft_version + "-" + config.forge_version
-// Setup the forge minecraft plugin data. Specify the preferred forge/minecraft version here
-minecraft {
-    version = config.minecraft_version + "-" + config.forge_version
-}
-
-
-// this sets our output jar to have a 'tag' of 'universal' on it
-// It also adds the minecraft version in a custom version name
-// The result is files named <projectname>-<mcversion>-<version>-universal.jar
-jar {
-    classifier = 'universal'
-    version = "${project.minecraft.version}-${project.version}"
-    manifest {
-        attributes 'Main-Class': 'codechicken.lib.tool.Main'
-    }
-
-}
-sourceSets {
-	main {
-		java {
-			srcDir new File(project.projectDir.parentFile, "src")
-		}
-	}
-}
-
-// Add in a source jar for people, should they desire to download such a thing
-task sourceJar(type: Jar) {
-	from sourceSets.main.allSource
-	classifier = 'src'
-    version = "${project.minecraft.version}-${project.version}"
-}
-
-// Add in an mcp named jar, for those who wish to run in a development environment (assuming mcp naming matches)
-task deobfJar(type: Jar) {
-	from sourceSets.main.output
-	classifier = 'dev'
-    version = "${project.minecraft.version}-${project.version}"
-	manifest {
-        attributes 'Main-Class': 'codechicken.lib.tool.Main'
-    }
-
-}
-
-// Tell the artifact system about our extra jars
-artifacts {
-	archives sourceJar, deobfJar
-}
-
-// Configure an upload task. this is setup for uploading to files.minecraftforge.net. There are other examples around
-uploadArchives {
-    dependsOn 'reobf'
-    repositories {
-        if (project.hasProperty("filesmaven")) {
-            logger.info('Publishing to files server')
-            
-            mavenDeployer {
-                configuration = configurations.deployJars
-
-                repository(url: project.filesmaven.url) {
-                    authentication(userName: project.filesmaven.username, privateKey: project.filesmaven.key)
-                }
-
-                // This is just the pom data for the maven repo
-                pom {
-                    groupId = project.group
-                    // Force the maven upload to use the <mcversion>-<version> syntax preferred at files
-                    version = "${project.minecraft.version}-${project.version}"
-                    artifactId = project.archivesBaseName
-                    project {
-                        name project.archivesBaseName
-                        packaging 'jar'
-                        description 'CodeChickenLib'
-                        url 'https://github.com/Chicken-Bones/CodeChickenLib'
-
-                        scm {
-                            url 'https://github.com/Chicken-Bones/CodeChickenLib'
-                            connection 'scm:git:git://github.com/Chicken-Bones/CodeChickenLib.git'
-                            developerConnection 'scm:git:git@github.com:Chicken-Bones/CodeChickenLib.git'
-                        }
-
-                        issueManagement {
-                            system 'github'
-                            url 'https://github.com/Chicken-Bones/CodeChickenLib/issues'
-                        }
-
-                        licenses {
-                            license {
-                                name 'GNU Lesser Public License (GPL), Version 2.1'
-                                url 'https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt'
-                                distribution 'repo'
-                            }
-                        }
-
-                        developers {
-                            developer {
-                                id 'chicken-bones'
-                                name 'chicken-bones'
-                                roles { role 'developer' }
-                            }
-                        }
-                    }
-                }
-            }
-        } else {
-            logger.info('Publishing to repo folder')
-            
-            mavenDeployer {
-                pom.version = "${project.minecraft.version}-${project.version}"
-                repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath())
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/build/build.properties b/build/build.properties
deleted file mode 100644
index 4c9f512..0000000
--- a/build/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-minecraft_version=1.7.10
-forge_version=10.13.3.1373-1.7.10
-mod_version=1.1.3
diff --git a/build/gradle/wrapper/gradle-wrapper.jar b/build/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 3c7abdf..0000000
Binary files a/build/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/build/settings.gradle b/build/settings.gradle
deleted file mode 100644
index 398e21f..0000000
--- a/build/settings.gradle
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * This settings file was auto generated by the Gradle buildInit task
- * by 'sunstrike' at '21/11/13 14:14' with Gradle 1.9
- *
- * The settings file is used to specify which projects to include in your build.
- * In a single project build this file can be empty or even removed.
- *
- * Detailed information about configuring a multi-project build in Gradle can be found
- * in the user guide at http://gradle.org/docs/1.9/userguide/multi_project_builds.html
- */
-
-/*
-// To declare projects as part of a multi-project build use the 'include' method
-include 'shared'
-include 'api'
-include 'services:webservice'
-*/
-
-rootProject.name = 'CodeChickenLib'
diff --git a/dependencies.gradle b/dependencies.gradle
new file mode 100644
index 0000000..b6456d0
--- /dev/null
+++ b/dependencies.gradle
@@ -0,0 +1,5 @@
+// Add your dependencies here
+
+dependencies {
+
+}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..2e0a9a3
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,60 @@
+modName = CodeChickenLib
+
+# This is a case-sensitive string to identify your mod. Convention is to use lower case.
+modId = CodeChickenLib
+
+modGroup = codechicken
+
+# WHY is there no version field?
+# The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the
+# code base or your binary. Check out this tutorial: https://blog.mattclemente.com/2017/10/13/versioning-with-git-tags/
+
+# Will update your build.gradle automatically whenever an update is available
+autoUpdateBuildScript = false
+
+minecraftVersion = 1.7.10
+forgeVersion = 10.13.4.1614
+
+# Select a username for testing your mod with breakpoints. You may leave this empty for a random user name each time you
+# restart Minecraft in development. Choose this dependent on your mod:
+# Do you need consistent player progressing (for example Thaumcraft)? -> Select a name
+# Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
+developmentEnvironmentUserName = "Developer"
+
+# Define a source file of your project with:
+# public static final String VERSION = "GRADLETOKEN_VERSION";
+# The string's content will be replaced with your mods version when compiled. You should use this to specify your mod's
+# version in @Mod([...], version = VERSION, [...])
+# Leave these properties empty to skip individual token replacements
+replaceGradleTokenInFile =
+gradleTokenModId =
+gradleTokenModName =
+gradleTokenVersion =
+gradleTokenGroupName =
+
+# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise you can
+# leave this property empty.
+# Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
+apiPackage =
+
+# Specify the configuration file for Forge's access transformers here. I must be placed into /src/main/resources/META-INF/
+# Example value: mymodid_at.cfg
+accessTransformersFile =
+
+# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
+usesMixins = false
+# Specify the location of your implementation of IMixinPlugin. Leave it empty otherwise.
+mixinPlugin =
+# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
+mixinsPackage =
+# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
+# This parameter is for legacy compatability only
+# Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin
+coreModClass =
+# If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
+# that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
+containsMixinsAndOrCoreModOnly = false
+
+# If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your
+# responsibility check the licence and request permission for distribution, if required.
+usesShadowedDependencies = false
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..5c2d1cf
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/build/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
similarity index 53%
rename from build/gradle/wrapper/gradle-wrapper.properties
rename to gradle/wrapper/gradle-wrapper.properties
index 244a668..3ab0b72 100644
--- a/build/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Wed Mar 26 13:33:58 CDT 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip
diff --git a/build/gradlew b/gradlew
similarity index 72%
rename from build/gradlew
rename to gradlew
index 91a7e26..83f2acf 100644
--- a/build/gradlew
+++ b/gradlew
@@ -1,4 +1,20 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
 ##
@@ -6,47 +22,6 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -61,9 +36,49 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -90,7 +105,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -110,10 +125,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+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
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +170,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/build/gradlew.bat b/gradlew.bat
similarity index 73%
rename from build/gradlew.bat
rename to gradlew.bat
index 8a0b282..9618d8d 100644
--- a/build/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -8,14 +24,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +62,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +75,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line
diff --git a/jitpack.yml b/jitpack.yml
new file mode 100644
index 0000000..09bbb51
--- /dev/null
+++ b/jitpack.yml
@@ -0,0 +1,2 @@
+before_install:
+  - ./gradlew setupCIWorkspace
\ No newline at end of file
diff --git a/repositories.gradle b/repositories.gradle
new file mode 100644
index 0000000..f7d641b
--- /dev/null
+++ b/repositories.gradle
@@ -0,0 +1,5 @@
+// Add any additional repositiroes for your dependencies here
+
+repositories {
+
+}
diff --git a/src/codechicken/lib/world/ChunkExtension.java b/src/codechicken/lib/world/ChunkExtension.java
deleted file mode 100644
index c3f17b7..0000000
--- a/src/codechicken/lib/world/ChunkExtension.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package codechicken.lib.world;
-
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.Packet;
-import net.minecraft.world.ChunkCoordIntPair;
-import net.minecraft.world.chunk.Chunk;
-
-import java.util.HashSet;
-
-public abstract class ChunkExtension
-{
-    public final Chunk chunk;
-    public final ChunkCoordIntPair coord;
-    public final WorldExtension world;
-    public HashSet<EntityPlayerMP> watchedPlayers;
-    
-    public ChunkExtension(Chunk chunk, WorldExtension world)
-    {
-        this.chunk = chunk;
-        coord = chunk.getChunkCoordIntPair();
-        this.world = world;
-        watchedPlayers = new HashSet<EntityPlayerMP>();
-    }
-    
-    public void loadData(NBTTagCompound tag)
-    {
-    }
-    
-    public void saveData(NBTTagCompound tag)
-    {
-    }
-    
-    public void load()
-    {
-    }
-    
-    public void unload()
-    {
-    }
-    
-    public final void sendPacketToPlayers(Packet packet)
-    {
-        for(EntityPlayerMP player : watchedPlayers)
-            player.playerNetServerHandler.sendPacket(packet);
-    }
-
-    public final void watchPlayer(EntityPlayerMP player)
-    {
-        watchedPlayers.add(player);
-        onWatchPlayer(player);
-    }
-    
-    public void onWatchPlayer(EntityPlayerMP player)
-    {
-    }
-
-    public final void unwatchPlayer(EntityPlayerMP player)
-    {
-        watchedPlayers.remove(player);
-        onUnWatchPlayer(player);
-    }
-    
-    public void onUnWatchPlayer(EntityPlayerMP player)
-    {
-    }
-
-    public void sendUpdatePackets()
-    {
-    }
-    
-    @Override
-    public int hashCode()
-    {
-        return coord.chunkXPos ^ coord.chunkZPos;
-    }
-    
-    @Override
-    public boolean equals(Object o)
-    {
-        return (o instanceof ChunkExtension && ((ChunkExtension)o).coord.equals(coord)) ||
-                (o instanceof ChunkCoordIntPair && coord.equals(o)) ||
-                (o instanceof Long && (Long)o == (((long)coord.chunkXPos)<<32 | coord.chunkZPos));
-    }
-}
diff --git a/src/codechicken/lib/world/IChunkLoadTile.java b/src/codechicken/lib/world/IChunkLoadTile.java
deleted file mode 100644
index 5739102..0000000
--- a/src/codechicken/lib/world/IChunkLoadTile.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package codechicken.lib.world;
-
-/**
- * Provides a callback for tile entities when a chunk is loaded, as an alternative to validate when the chunk hasn't been added to the world.
- * To hook all world join/seperate events. Use this, TileEntity.validate with a worldObj.blockExists check, TileEntity.onChunkUnload and TileEntity.invalidate
- * Be sure to call TileChunkLoadHook.init() from your mod during initialisation
- * You could easily implement this in your own mod, but providing it here reduces the number of times the chunkTileEntityMap needs to be iterated
- */
-public interface IChunkLoadTile
-{
-    public void onChunkLoad();
-}
diff --git a/src/codechicken/lib/world/TileChunkLoadHook.java b/src/codechicken/lib/world/TileChunkLoadHook.java
deleted file mode 100644
index e080c2e..0000000
--- a/src/codechicken/lib/world/TileChunkLoadHook.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package codechicken.lib.world;
-
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.world.ChunkEvent;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class TileChunkLoadHook
-{
-    private static boolean init;
-    public static void init() {
-        if(init) return;
-        init = true;
-
-        MinecraftForge.EVENT_BUS.register(new TileChunkLoadHook());
-    }
-
-    @SubscribeEvent
-    public void onChunkLoad(ChunkEvent.Load event) {
-        List<TileEntity> list = new ArrayList<TileEntity>(event.getChunk().chunkTileEntityMap.values());
-        for(TileEntity t : list)
-            if(t instanceof IChunkLoadTile)
-                ((IChunkLoadTile)t).onChunkLoad();
-    }
-}
diff --git a/src/codechicken/lib/world/WorldExtension.java b/src/codechicken/lib/world/WorldExtension.java
deleted file mode 100644
index 3015f93..0000000
--- a/src/codechicken/lib/world/WorldExtension.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package codechicken.lib.world;
-
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
-import net.minecraft.world.chunk.Chunk;
-
-import java.util.HashMap;
-
-public abstract class WorldExtension
-{
-    public final World world;
-    public HashMap<Chunk, ChunkExtension> chunkMap = new HashMap<Chunk, ChunkExtension>();
-    
-    public WorldExtension(World world)
-    {
-        this.world = world;
-    }
-    
-    public void load()
-    {
-    }
-    
-    public void unload()
-    {
-    }
-    
-    public void save()
-    {
-    }
-    
-    public void preTick()
-    {
-    }
-    
-    public void postTick()
-    {
-    }
-        
-    protected final void addChunk(ChunkExtension extension)
-    {
-        chunkMap.put(extension.chunk, extension);
-    }
-    
-    protected final void loadChunk(Chunk chunk)
-    {
-        chunkMap.get(chunk).load();
-    }
-    
-    protected final void unloadChunk(Chunk chunk)
-    {
-        chunkMap.get(chunk).unload();
-    }
-    
-    protected final void loadChunkData(Chunk chunk, NBTTagCompound tag)
-    {
-        chunkMap.get(chunk).loadData(tag);
-    }
-    
-    protected final void saveChunkData(Chunk chunk, NBTTagCompound tag)
-    {
-        chunkMap.get(chunk).saveData(tag);
-    }
-    
-    protected final void remChunk(Chunk chunk)
-    {
-        chunkMap.remove(chunk);
-    }
-
-    protected final void watchChunk(Chunk chunk, EntityPlayerMP player)
-    {
-        chunkMap.get(chunk).watchPlayer(player);
-    }
-
-    protected final void unwatchChunk(Chunk chunk, EntityPlayerMP player)
-    {
-        ChunkExtension extension = chunkMap.get(chunk);
-        if(extension != null)
-            extension.unwatchPlayer(player);
-    }
-
-    protected final void sendChunkUpdates(Chunk chunk)
-    {
-        chunkMap.get(chunk).sendUpdatePackets();
-    }
-
-    public boolean containsChunk(Chunk chunk)
-    {
-        return chunkMap.containsKey(chunk);
-    }
-
-    public ChunkExtension getChunkExtension(int chunkXPos, int chunkZPos)
-    {
-        if(!world.blockExists(chunkXPos<<4, 128, chunkZPos<<4))
-            return null;
-        
-        return chunkMap.get(world.getChunkFromChunkCoords(chunkXPos, chunkZPos));
-    }
-}
diff --git a/src/codechicken/lib/world/WorldExtensionInstantiator.java b/src/codechicken/lib/world/WorldExtensionInstantiator.java
deleted file mode 100644
index 23431b0..0000000
--- a/src/codechicken/lib/world/WorldExtensionInstantiator.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package codechicken.lib.world;
-
-import net.minecraft.world.World;
-import net.minecraft.world.chunk.Chunk;
-
-public abstract class WorldExtensionInstantiator
-{
-    public int instantiatorID;
-    
-    public abstract WorldExtension createWorldExtension(World world);
-    public abstract ChunkExtension createChunkExtension(Chunk chunk, WorldExtension world);
-    
-    public WorldExtension getExtension(World world)
-    {
-        return WorldExtensionManager.getWorldExtension(world, instantiatorID);
-    }
-}
diff --git a/src/codechicken/lib/world/WorldExtensionManager.java b/src/codechicken/lib/world/WorldExtensionManager.java
deleted file mode 100644
index b8ec2b4..0000000
--- a/src/codechicken/lib/world/WorldExtensionManager.java
+++ /dev/null
@@ -1,201 +0,0 @@
-package codechicken.lib.world;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.TickEvent;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.client.Minecraft;
-import net.minecraft.world.World;
-import net.minecraft.world.chunk.Chunk;
-import net.minecraft.world.chunk.EmptyChunk;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.world.ChunkDataEvent;
-import net.minecraftforge.event.world.ChunkEvent;
-import net.minecraftforge.event.world.ChunkWatchEvent.UnWatch;
-import net.minecraftforge.event.world.ChunkWatchEvent.Watch;
-import net.minecraftforge.event.world.WorldEvent;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-public class WorldExtensionManager
-{    
-    public static class WorldExtensionEventHandler
-    {
-        @SubscribeEvent
-        public void onChunkDataLoad(ChunkDataEvent.Load event)
-        {
-            if(!worldMap.containsKey(event.world))
-                WorldExtensionManager.onWorldLoad(event.world);
-            
-            createChunkExtension(event.world, event.getChunk());
-
-            for(WorldExtension extension : worldMap.get(event.world))
-                extension.loadChunkData(event.getChunk(), event.getData());
-        }
-
-        @SubscribeEvent
-        public void onChunkDataSave(ChunkDataEvent.Save event)
-        {
-            for(WorldExtension extension : worldMap.get(event.world))
-                extension.saveChunkData(event.getChunk(), event.getData());
-            
-            if(!event.getChunk().isChunkLoaded)
-                removeChunk(event.world, event.getChunk());
-        }
-        
-        @SubscribeEvent
-        public void onChunkLoad(ChunkEvent.Load event)
-        {
-            if(!worldMap.containsKey(event.world))
-                WorldExtensionManager.onWorldLoad(event.world);
-            
-            createChunkExtension(event.world, event.getChunk());
-            
-            for(WorldExtension extension : worldMap.get(event.world))
-                extension.loadChunk(event.getChunk());
-        }
-
-        @SubscribeEvent
-        public void onChunkUnLoad(ChunkEvent.Unload event)
-        {
-            if(event.getChunk() instanceof EmptyChunk)
-                return;
-            
-            for(WorldExtension extension : worldMap.get(event.world))
-                extension.unloadChunk(event.getChunk());
-            
-            if(event.world.isRemote)
-                removeChunk(event.world, event.getChunk());
-        }
-
-        @SubscribeEvent
-        public void onWorldSave(WorldEvent.Save event)
-        {
-            if(worldMap.containsKey(event.world))
-                for(WorldExtension extension : worldMap.get(event.world))
-                    extension.save();
-        }
-
-        @SubscribeEvent
-        public void onWorldLoad(WorldEvent.Load event)
-        {
-            if(!worldMap.containsKey(event.world))
-                WorldExtensionManager.onWorldLoad(event.world);
-        }
-
-        @SubscribeEvent
-        public void onWorldUnLoad(WorldEvent.Unload event)
-        {
-            if(worldMap.containsKey(event.world))//because force closing unloads a world twice
-                for(WorldExtension extension : worldMap.remove(event.world))
-                    extension.unload();
-        }
-        
-        @SubscribeEvent
-        public void onChunkWatch(Watch event)
-        {            
-            Chunk chunk = event.player.worldObj.getChunkFromChunkCoords(event.chunk.chunkXPos, event.chunk.chunkZPos);
-            for(WorldExtension extension : worldMap.get(event.player.worldObj))
-                extension.watchChunk(chunk, event.player);
-        }
-
-        @SubscribeEvent
-        @SideOnly(Side.CLIENT)
-        public void onChunkUnWatch(UnWatch event)
-        {
-            Chunk chunk = event.player.worldObj.getChunkFromChunkCoords(event.chunk.chunkXPos, event.chunk.chunkZPos);
-            for(WorldExtension extension : worldMap.get(event.player.worldObj))
-                extension.unwatchChunk(chunk, event.player);
-        }
-
-        @SubscribeEvent
-        @SideOnly(Side.CLIENT)
-        public void clientTick(TickEvent.ClientTickEvent event)
-        {
-            World world = Minecraft.getMinecraft().theWorld;
-            if (worldMap.containsKey(world))
-                if (event.phase == TickEvent.Phase.START)
-                    preTick(world);
-                else
-                    postTick(world);
-        }
-
-        @SubscribeEvent
-        public void serverTick(TickEvent.WorldTickEvent event)
-        {
-            if(!worldMap.containsKey(event.world))
-                WorldExtensionManager.onWorldLoad(event.world);
-
-            if(event.phase == TickEvent.Phase.START)
-                preTick(event.world);
-            else
-                postTick(event.world);
-        }
-    }
-    
-    private static boolean initialised;
-    private static ArrayList<WorldExtensionInstantiator> extensionIntialisers = new ArrayList<WorldExtensionInstantiator>();
-    
-    public static void registerWorldExtension(WorldExtensionInstantiator init)
-    {
-        if(!initialised)
-            init();
-        
-        init.instantiatorID = extensionIntialisers.size();
-        extensionIntialisers.add(init);
-    }
-
-    private static void init()
-    {
-        initialised = true;
-        MinecraftForge.EVENT_BUS.register(new WorldExtensionEventHandler());
-        FMLCommonHandler.instance().bus().register(new WorldExtensionEventHandler());
-    }
-
-    private static HashMap<World, WorldExtension[]> worldMap = new HashMap<World, WorldExtension[]>();
-    
-    private static void onWorldLoad(World world)
-    {
-        WorldExtension[] extensions = new WorldExtension[extensionIntialisers.size()];
-        for(int i = 0; i < extensions.length; i++)
-            extensions[i] = extensionIntialisers.get(i).createWorldExtension(world);
-        
-        worldMap.put(world, extensions);
-        
-        for(WorldExtension extension : extensions)
-            extension.load();
-    }
-
-    private static void createChunkExtension(World world, Chunk chunk)
-    {
-        WorldExtension[] extensions = worldMap.get(world);
-        for(int i = 0; i < extensionIntialisers.size(); i++)
-            if(!extensions[i].containsChunk(chunk))
-                extensions[i].addChunk(extensionIntialisers.get(i).createChunkExtension(chunk, extensions[i]));
-    }
-    
-    private static void removeChunk(World world, Chunk chunk)
-    {
-        for(WorldExtension extension : worldMap.get(world))
-            extension.remChunk(chunk);
-    }
-    
-    private static void preTick(World world)
-    {
-        for(WorldExtension extension : worldMap.get(world))
-            extension.preTick();
-    }
-    
-    private static void postTick(World world)
-    {
-        for(WorldExtension extension : worldMap.get(world))
-            extension.postTick();
-    }
-
-    public static WorldExtension getWorldExtension(World world, int instantiatorID)
-    {
-        return worldMap.get(world)[instantiatorID];
-    }
-}
diff --git a/src/codechicken/lib/asm/ASMBlock.java b/src/main/java/codechicken/lib/asm/ASMBlock.java
similarity index 100%
rename from src/codechicken/lib/asm/ASMBlock.java
rename to src/main/java/codechicken/lib/asm/ASMBlock.java
diff --git a/src/codechicken/lib/asm/ASMHelper.java b/src/main/java/codechicken/lib/asm/ASMHelper.java
similarity index 100%
rename from src/codechicken/lib/asm/ASMHelper.java
rename to src/main/java/codechicken/lib/asm/ASMHelper.java
diff --git a/src/codechicken/lib/asm/ASMInit.java b/src/main/java/codechicken/lib/asm/ASMInit.java
similarity index 100%
rename from src/codechicken/lib/asm/ASMInit.java
rename to src/main/java/codechicken/lib/asm/ASMInit.java
diff --git a/src/codechicken/lib/asm/ASMReader.java b/src/main/java/codechicken/lib/asm/ASMReader.java
similarity index 100%
rename from src/codechicken/lib/asm/ASMReader.java
rename to src/main/java/codechicken/lib/asm/ASMReader.java
diff --git a/src/codechicken/lib/asm/CC_ClassWriter.java b/src/main/java/codechicken/lib/asm/CC_ClassWriter.java
similarity index 100%
rename from src/codechicken/lib/asm/CC_ClassWriter.java
rename to src/main/java/codechicken/lib/asm/CC_ClassWriter.java
diff --git a/src/codechicken/lib/asm/ClassHeirachyManager.java b/src/main/java/codechicken/lib/asm/ClassHeirachyManager.java
similarity index 100%
rename from src/codechicken/lib/asm/ClassHeirachyManager.java
rename to src/main/java/codechicken/lib/asm/ClassHeirachyManager.java
diff --git a/src/codechicken/lib/asm/ImportantInsnVisitor.java b/src/main/java/codechicken/lib/asm/ImportantInsnVisitor.java
similarity index 100%
rename from src/codechicken/lib/asm/ImportantInsnVisitor.java
rename to src/main/java/codechicken/lib/asm/ImportantInsnVisitor.java
diff --git a/src/codechicken/lib/asm/InsnComparator.java b/src/main/java/codechicken/lib/asm/InsnComparator.java
similarity index 100%
rename from src/codechicken/lib/asm/InsnComparator.java
rename to src/main/java/codechicken/lib/asm/InsnComparator.java
diff --git a/src/codechicken/lib/asm/InsnListSection.java b/src/main/java/codechicken/lib/asm/InsnListSection.java
similarity index 100%
rename from src/codechicken/lib/asm/InsnListSection.java
rename to src/main/java/codechicken/lib/asm/InsnListSection.java
diff --git a/src/codechicken/lib/asm/LocalVariablesSorterVisitor.java b/src/main/java/codechicken/lib/asm/LocalVariablesSorterVisitor.java
similarity index 100%
rename from src/codechicken/lib/asm/LocalVariablesSorterVisitor.java
rename to src/main/java/codechicken/lib/asm/LocalVariablesSorterVisitor.java
diff --git a/src/codechicken/lib/asm/ModularASMTransformer.java b/src/main/java/codechicken/lib/asm/ModularASMTransformer.java
similarity index 100%
rename from src/codechicken/lib/asm/ModularASMTransformer.java
rename to src/main/java/codechicken/lib/asm/ModularASMTransformer.java
diff --git a/src/codechicken/lib/asm/ObfMapping.java b/src/main/java/codechicken/lib/asm/ObfMapping.java
similarity index 100%
rename from src/codechicken/lib/asm/ObfMapping.java
rename to src/main/java/codechicken/lib/asm/ObfMapping.java
diff --git a/src/codechicken/lib/colour/Colour.java b/src/main/java/codechicken/lib/colour/Colour.java
similarity index 100%
rename from src/codechicken/lib/colour/Colour.java
rename to src/main/java/codechicken/lib/colour/Colour.java
diff --git a/src/codechicken/lib/colour/ColourARGB.java b/src/main/java/codechicken/lib/colour/ColourARGB.java
similarity index 100%
rename from src/codechicken/lib/colour/ColourARGB.java
rename to src/main/java/codechicken/lib/colour/ColourARGB.java
diff --git a/src/codechicken/lib/colour/ColourRGBA.java b/src/main/java/codechicken/lib/colour/ColourRGBA.java
similarity index 100%
rename from src/codechicken/lib/colour/ColourRGBA.java
rename to src/main/java/codechicken/lib/colour/ColourRGBA.java
diff --git a/src/codechicken/lib/colour/CustomGradient.java b/src/main/java/codechicken/lib/colour/CustomGradient.java
similarity index 100%
rename from src/codechicken/lib/colour/CustomGradient.java
rename to src/main/java/codechicken/lib/colour/CustomGradient.java
diff --git a/src/codechicken/lib/config/ConfigFile.java b/src/main/java/codechicken/lib/config/ConfigFile.java
similarity index 100%
rename from src/codechicken/lib/config/ConfigFile.java
rename to src/main/java/codechicken/lib/config/ConfigFile.java
diff --git a/src/codechicken/lib/config/ConfigTag.java b/src/main/java/codechicken/lib/config/ConfigTag.java
similarity index 100%
rename from src/codechicken/lib/config/ConfigTag.java
rename to src/main/java/codechicken/lib/config/ConfigTag.java
diff --git a/src/codechicken/lib/config/ConfigTagParent.java b/src/main/java/codechicken/lib/config/ConfigTagParent.java
similarity index 100%
rename from src/codechicken/lib/config/ConfigTagParent.java
rename to src/main/java/codechicken/lib/config/ConfigTagParent.java
diff --git a/src/codechicken/lib/config/DefaultingConfigFile.java b/src/main/java/codechicken/lib/config/DefaultingConfigFile.java
similarity index 100%
rename from src/codechicken/lib/config/DefaultingConfigFile.java
rename to src/main/java/codechicken/lib/config/DefaultingConfigFile.java
diff --git a/src/codechicken/lib/config/SimpleProperties.java b/src/main/java/codechicken/lib/config/SimpleProperties.java
similarity index 100%
rename from src/codechicken/lib/config/SimpleProperties.java
rename to src/main/java/codechicken/lib/config/SimpleProperties.java
diff --git a/src/codechicken/lib/data/MCDataInput.java b/src/main/java/codechicken/lib/data/MCDataInput.java
similarity index 100%
rename from src/codechicken/lib/data/MCDataInput.java
rename to src/main/java/codechicken/lib/data/MCDataInput.java
diff --git a/src/codechicken/lib/data/MCDataInputStream.java b/src/main/java/codechicken/lib/data/MCDataInputStream.java
similarity index 100%
rename from src/codechicken/lib/data/MCDataInputStream.java
rename to src/main/java/codechicken/lib/data/MCDataInputStream.java
diff --git a/src/codechicken/lib/data/MCDataOutput.java b/src/main/java/codechicken/lib/data/MCDataOutput.java
similarity index 100%
rename from src/codechicken/lib/data/MCDataOutput.java
rename to src/main/java/codechicken/lib/data/MCDataOutput.java
diff --git a/src/codechicken/lib/data/MCDataOutputStream.java b/src/main/java/codechicken/lib/data/MCDataOutputStream.java
similarity index 100%
rename from src/codechicken/lib/data/MCDataOutputStream.java
rename to src/main/java/codechicken/lib/data/MCDataOutputStream.java
diff --git a/src/codechicken/lib/data/MCDataOutputWrapper.java b/src/main/java/codechicken/lib/data/MCDataOutputWrapper.java
similarity index 100%
rename from src/codechicken/lib/data/MCDataOutputWrapper.java
rename to src/main/java/codechicken/lib/data/MCDataOutputWrapper.java
diff --git a/src/codechicken/lib/gui/Canvas9Seg.java b/src/main/java/codechicken/lib/gui/Canvas9Seg.java
similarity index 100%
rename from src/codechicken/lib/gui/Canvas9Seg.java
rename to src/main/java/codechicken/lib/gui/Canvas9Seg.java
diff --git a/src/codechicken/lib/gui/GuiDraw.java b/src/main/java/codechicken/lib/gui/GuiDraw.java
similarity index 100%
rename from src/codechicken/lib/gui/GuiDraw.java
rename to src/main/java/codechicken/lib/gui/GuiDraw.java
diff --git a/src/codechicken/lib/inventory/ContainerExtended.java b/src/main/java/codechicken/lib/inventory/ContainerExtended.java
similarity index 100%
rename from src/codechicken/lib/inventory/ContainerExtended.java
rename to src/main/java/codechicken/lib/inventory/ContainerExtended.java
diff --git a/src/codechicken/lib/inventory/ContainerSynchronised.java b/src/main/java/codechicken/lib/inventory/ContainerSynchronised.java
similarity index 100%
rename from src/codechicken/lib/inventory/ContainerSynchronised.java
rename to src/main/java/codechicken/lib/inventory/ContainerSynchronised.java
diff --git a/src/codechicken/lib/inventory/IContainerSyncVar.java b/src/main/java/codechicken/lib/inventory/IContainerSyncVar.java
similarity index 100%
rename from src/codechicken/lib/inventory/IContainerSyncVar.java
rename to src/main/java/codechicken/lib/inventory/IContainerSyncVar.java
diff --git a/src/codechicken/lib/inventory/IntegerSync.java b/src/main/java/codechicken/lib/inventory/IntegerSync.java
similarity index 100%
rename from src/codechicken/lib/inventory/IntegerSync.java
rename to src/main/java/codechicken/lib/inventory/IntegerSync.java
diff --git a/src/codechicken/lib/inventory/InventoryCopy.java b/src/main/java/codechicken/lib/inventory/InventoryCopy.java
similarity index 100%
rename from src/codechicken/lib/inventory/InventoryCopy.java
rename to src/main/java/codechicken/lib/inventory/InventoryCopy.java
diff --git a/src/codechicken/lib/inventory/InventoryNBT.java b/src/main/java/codechicken/lib/inventory/InventoryNBT.java
similarity index 100%
rename from src/codechicken/lib/inventory/InventoryNBT.java
rename to src/main/java/codechicken/lib/inventory/InventoryNBT.java
diff --git a/src/codechicken/lib/inventory/InventoryRange.java b/src/main/java/codechicken/lib/inventory/InventoryRange.java
similarity index 100%
rename from src/codechicken/lib/inventory/InventoryRange.java
rename to src/main/java/codechicken/lib/inventory/InventoryRange.java
diff --git a/src/codechicken/lib/inventory/InventorySimple.java b/src/main/java/codechicken/lib/inventory/InventorySimple.java
similarity index 100%
rename from src/codechicken/lib/inventory/InventorySimple.java
rename to src/main/java/codechicken/lib/inventory/InventorySimple.java
diff --git a/src/codechicken/lib/inventory/InventoryUtils.java b/src/main/java/codechicken/lib/inventory/InventoryUtils.java
similarity index 100%
rename from src/codechicken/lib/inventory/InventoryUtils.java
rename to src/main/java/codechicken/lib/inventory/InventoryUtils.java
diff --git a/src/codechicken/lib/inventory/ItemKey.java b/src/main/java/codechicken/lib/inventory/ItemKey.java
similarity index 100%
rename from src/codechicken/lib/inventory/ItemKey.java
rename to src/main/java/codechicken/lib/inventory/ItemKey.java
diff --git a/src/codechicken/lib/inventory/SlotDummy.java b/src/main/java/codechicken/lib/inventory/SlotDummy.java
similarity index 100%
rename from src/codechicken/lib/inventory/SlotDummy.java
rename to src/main/java/codechicken/lib/inventory/SlotDummy.java
diff --git a/src/codechicken/lib/inventory/SlotDummyOutput.java b/src/main/java/codechicken/lib/inventory/SlotDummyOutput.java
similarity index 100%
rename from src/codechicken/lib/inventory/SlotDummyOutput.java
rename to src/main/java/codechicken/lib/inventory/SlotDummyOutput.java
diff --git a/src/codechicken/lib/inventory/SlotHandleClicks.java b/src/main/java/codechicken/lib/inventory/SlotHandleClicks.java
similarity index 100%
rename from src/codechicken/lib/inventory/SlotHandleClicks.java
rename to src/main/java/codechicken/lib/inventory/SlotHandleClicks.java
diff --git a/src/codechicken/lib/lighting/LC.java b/src/main/java/codechicken/lib/lighting/LC.java
similarity index 100%
rename from src/codechicken/lib/lighting/LC.java
rename to src/main/java/codechicken/lib/lighting/LC.java
diff --git a/src/codechicken/lib/lighting/LightMatrix.java b/src/main/java/codechicken/lib/lighting/LightMatrix.java
similarity index 100%
rename from src/codechicken/lib/lighting/LightMatrix.java
rename to src/main/java/codechicken/lib/lighting/LightMatrix.java
diff --git a/src/codechicken/lib/lighting/LightModel.java b/src/main/java/codechicken/lib/lighting/LightModel.java
similarity index 100%
rename from src/codechicken/lib/lighting/LightModel.java
rename to src/main/java/codechicken/lib/lighting/LightModel.java
diff --git a/src/codechicken/lib/lighting/PlanarLightMatrix.java b/src/main/java/codechicken/lib/lighting/PlanarLightMatrix.java
similarity index 100%
rename from src/codechicken/lib/lighting/PlanarLightMatrix.java
rename to src/main/java/codechicken/lib/lighting/PlanarLightMatrix.java
diff --git a/src/codechicken/lib/lighting/PlanarLightModel.java b/src/main/java/codechicken/lib/lighting/PlanarLightModel.java
similarity index 100%
rename from src/codechicken/lib/lighting/PlanarLightModel.java
rename to src/main/java/codechicken/lib/lighting/PlanarLightModel.java
diff --git a/src/codechicken/lib/lighting/SimpleBrightnessModel.java b/src/main/java/codechicken/lib/lighting/SimpleBrightnessModel.java
similarity index 100%
rename from src/codechicken/lib/lighting/SimpleBrightnessModel.java
rename to src/main/java/codechicken/lib/lighting/SimpleBrightnessModel.java
diff --git a/src/codechicken/lib/math/MathHelper.java b/src/main/java/codechicken/lib/math/MathHelper.java
similarity index 100%
rename from src/codechicken/lib/math/MathHelper.java
rename to src/main/java/codechicken/lib/math/MathHelper.java
diff --git a/src/codechicken/lib/packet/ICustomPacketTile.java b/src/main/java/codechicken/lib/packet/ICustomPacketTile.java
similarity index 100%
rename from src/codechicken/lib/packet/ICustomPacketTile.java
rename to src/main/java/codechicken/lib/packet/ICustomPacketTile.java
diff --git a/src/codechicken/lib/packet/PacketCustom.java b/src/main/java/codechicken/lib/packet/PacketCustom.java
similarity index 100%
rename from src/codechicken/lib/packet/PacketCustom.java
rename to src/main/java/codechicken/lib/packet/PacketCustom.java
diff --git a/src/codechicken/lib/raytracer/ExtendedMOP.java b/src/main/java/codechicken/lib/raytracer/ExtendedMOP.java
similarity index 100%
rename from src/codechicken/lib/raytracer/ExtendedMOP.java
rename to src/main/java/codechicken/lib/raytracer/ExtendedMOP.java
diff --git a/src/codechicken/lib/raytracer/IndexedCuboid6.java b/src/main/java/codechicken/lib/raytracer/IndexedCuboid6.java
similarity index 100%
rename from src/codechicken/lib/raytracer/IndexedCuboid6.java
rename to src/main/java/codechicken/lib/raytracer/IndexedCuboid6.java
diff --git a/src/codechicken/lib/raytracer/RayTracer.java b/src/main/java/codechicken/lib/raytracer/RayTracer.java
similarity index 100%
rename from src/codechicken/lib/raytracer/RayTracer.java
rename to src/main/java/codechicken/lib/raytracer/RayTracer.java
diff --git a/src/codechicken/lib/render/BlockRenderer.java b/src/main/java/codechicken/lib/render/BlockRenderer.java
similarity index 100%
rename from src/codechicken/lib/render/BlockRenderer.java
rename to src/main/java/codechicken/lib/render/BlockRenderer.java
diff --git a/src/codechicken/lib/render/CCModel.java b/src/main/java/codechicken/lib/render/CCModel.java
similarity index 100%
rename from src/codechicken/lib/render/CCModel.java
rename to src/main/java/codechicken/lib/render/CCModel.java
diff --git a/src/codechicken/lib/render/CCModelLibrary.java b/src/main/java/codechicken/lib/render/CCModelLibrary.java
similarity index 100%
rename from src/codechicken/lib/render/CCModelLibrary.java
rename to src/main/java/codechicken/lib/render/CCModelLibrary.java
diff --git a/src/codechicken/lib/render/CCRenderPipeline.java b/src/main/java/codechicken/lib/render/CCRenderPipeline.java
similarity index 100%
rename from src/codechicken/lib/render/CCRenderPipeline.java
rename to src/main/java/codechicken/lib/render/CCRenderPipeline.java
diff --git a/src/codechicken/lib/render/CCRenderState.java b/src/main/java/codechicken/lib/render/CCRenderState.java
similarity index 100%
rename from src/codechicken/lib/render/CCRenderState.java
rename to src/main/java/codechicken/lib/render/CCRenderState.java
diff --git a/src/codechicken/lib/render/ColourMultiplier.java b/src/main/java/codechicken/lib/render/ColourMultiplier.java
similarity index 100%
rename from src/codechicken/lib/render/ColourMultiplier.java
rename to src/main/java/codechicken/lib/render/ColourMultiplier.java
diff --git a/src/codechicken/lib/render/EntityDigIconFX.java b/src/main/java/codechicken/lib/render/EntityDigIconFX.java
similarity index 100%
rename from src/codechicken/lib/render/EntityDigIconFX.java
rename to src/main/java/codechicken/lib/render/EntityDigIconFX.java
diff --git a/src/codechicken/lib/render/FontUtils.java b/src/main/java/codechicken/lib/render/FontUtils.java
similarity index 100%
rename from src/codechicken/lib/render/FontUtils.java
rename to src/main/java/codechicken/lib/render/FontUtils.java
diff --git a/src/codechicken/lib/render/IFaceRenderer.java b/src/main/java/codechicken/lib/render/IFaceRenderer.java
similarity index 100%
rename from src/codechicken/lib/render/IFaceRenderer.java
rename to src/main/java/codechicken/lib/render/IFaceRenderer.java
diff --git a/src/codechicken/lib/render/ManagedTextureFX.java b/src/main/java/codechicken/lib/render/ManagedTextureFX.java
similarity index 100%
rename from src/codechicken/lib/render/ManagedTextureFX.java
rename to src/main/java/codechicken/lib/render/ManagedTextureFX.java
diff --git a/src/codechicken/lib/render/PlaceholderTexture.java b/src/main/java/codechicken/lib/render/PlaceholderTexture.java
similarity index 100%
rename from src/codechicken/lib/render/PlaceholderTexture.java
rename to src/main/java/codechicken/lib/render/PlaceholderTexture.java
diff --git a/src/codechicken/lib/render/QBImporter.java b/src/main/java/codechicken/lib/render/QBImporter.java
similarity index 100%
rename from src/codechicken/lib/render/QBImporter.java
rename to src/main/java/codechicken/lib/render/QBImporter.java
diff --git a/src/codechicken/lib/render/RenderUtils.java b/src/main/java/codechicken/lib/render/RenderUtils.java
similarity index 100%
rename from src/codechicken/lib/render/RenderUtils.java
rename to src/main/java/codechicken/lib/render/RenderUtils.java
diff --git a/src/codechicken/lib/render/ShaderProgram.java b/src/main/java/codechicken/lib/render/ShaderProgram.java
similarity index 100%
rename from src/codechicken/lib/render/ShaderProgram.java
rename to src/main/java/codechicken/lib/render/ShaderProgram.java
diff --git a/src/codechicken/lib/render/SpriteSheetManager.java b/src/main/java/codechicken/lib/render/SpriteSheetManager.java
similarity index 100%
rename from src/codechicken/lib/render/SpriteSheetManager.java
rename to src/main/java/codechicken/lib/render/SpriteSheetManager.java
diff --git a/src/codechicken/lib/render/TextureDataHolder.java b/src/main/java/codechicken/lib/render/TextureDataHolder.java
similarity index 100%
rename from src/codechicken/lib/render/TextureDataHolder.java
rename to src/main/java/codechicken/lib/render/TextureDataHolder.java
diff --git a/src/codechicken/lib/render/TextureFX.java b/src/main/java/codechicken/lib/render/TextureFX.java
similarity index 100%
rename from src/codechicken/lib/render/TextureFX.java
rename to src/main/java/codechicken/lib/render/TextureFX.java
diff --git a/src/codechicken/lib/render/TextureSpecial.java b/src/main/java/codechicken/lib/render/TextureSpecial.java
similarity index 100%
rename from src/codechicken/lib/render/TextureSpecial.java
rename to src/main/java/codechicken/lib/render/TextureSpecial.java
diff --git a/src/codechicken/lib/render/TextureUtils.java b/src/main/java/codechicken/lib/render/TextureUtils.java
similarity index 100%
rename from src/codechicken/lib/render/TextureUtils.java
rename to src/main/java/codechicken/lib/render/TextureUtils.java
diff --git a/src/codechicken/lib/render/Vertex5.java b/src/main/java/codechicken/lib/render/Vertex5.java
similarity index 100%
rename from src/codechicken/lib/render/Vertex5.java
rename to src/main/java/codechicken/lib/render/Vertex5.java
diff --git a/src/codechicken/lib/render/uv/IconTransformation.java b/src/main/java/codechicken/lib/render/uv/IconTransformation.java
similarity index 100%
rename from src/codechicken/lib/render/uv/IconTransformation.java
rename to src/main/java/codechicken/lib/render/uv/IconTransformation.java
diff --git a/src/codechicken/lib/render/uv/MultiIconTransformation.java b/src/main/java/codechicken/lib/render/uv/MultiIconTransformation.java
similarity index 100%
rename from src/codechicken/lib/render/uv/MultiIconTransformation.java
rename to src/main/java/codechicken/lib/render/uv/MultiIconTransformation.java
diff --git a/src/codechicken/lib/render/uv/UV.java b/src/main/java/codechicken/lib/render/uv/UV.java
similarity index 100%
rename from src/codechicken/lib/render/uv/UV.java
rename to src/main/java/codechicken/lib/render/uv/UV.java
diff --git a/src/codechicken/lib/render/uv/UVRotation.java b/src/main/java/codechicken/lib/render/uv/UVRotation.java
similarity index 100%
rename from src/codechicken/lib/render/uv/UVRotation.java
rename to src/main/java/codechicken/lib/render/uv/UVRotation.java
diff --git a/src/codechicken/lib/render/uv/UVScale.java b/src/main/java/codechicken/lib/render/uv/UVScale.java
similarity index 100%
rename from src/codechicken/lib/render/uv/UVScale.java
rename to src/main/java/codechicken/lib/render/uv/UVScale.java
diff --git a/src/codechicken/lib/render/uv/UVTransformation.java b/src/main/java/codechicken/lib/render/uv/UVTransformation.java
similarity index 100%
rename from src/codechicken/lib/render/uv/UVTransformation.java
rename to src/main/java/codechicken/lib/render/uv/UVTransformation.java
diff --git a/src/codechicken/lib/render/uv/UVTransformationList.java b/src/main/java/codechicken/lib/render/uv/UVTransformationList.java
similarity index 100%
rename from src/codechicken/lib/render/uv/UVTransformationList.java
rename to src/main/java/codechicken/lib/render/uv/UVTransformationList.java
diff --git a/src/codechicken/lib/render/uv/UVTranslation.java b/src/main/java/codechicken/lib/render/uv/UVTranslation.java
similarity index 100%
rename from src/codechicken/lib/render/uv/UVTranslation.java
rename to src/main/java/codechicken/lib/render/uv/UVTranslation.java
diff --git a/src/codechicken/lib/tool/LibDownloader.java b/src/main/java/codechicken/lib/tool/LibDownloader.java
similarity index 100%
rename from src/codechicken/lib/tool/LibDownloader.java
rename to src/main/java/codechicken/lib/tool/LibDownloader.java
diff --git a/src/codechicken/lib/tool/MCStripTransformer.java b/src/main/java/codechicken/lib/tool/MCStripTransformer.java
similarity index 100%
rename from src/codechicken/lib/tool/MCStripTransformer.java
rename to src/main/java/codechicken/lib/tool/MCStripTransformer.java
diff --git a/src/codechicken/lib/tool/Main.java b/src/main/java/codechicken/lib/tool/Main.java
similarity index 100%
rename from src/codechicken/lib/tool/Main.java
rename to src/main/java/codechicken/lib/tool/Main.java
diff --git a/src/codechicken/lib/tool/StripClassLoader.java b/src/main/java/codechicken/lib/tool/StripClassLoader.java
similarity index 100%
rename from src/codechicken/lib/tool/StripClassLoader.java
rename to src/main/java/codechicken/lib/tool/StripClassLoader.java
diff --git a/src/codechicken/lib/tool/ToolMain.java b/src/main/java/codechicken/lib/tool/ToolMain.java
similarity index 100%
rename from src/codechicken/lib/tool/ToolMain.java
rename to src/main/java/codechicken/lib/tool/ToolMain.java
diff --git a/src/codechicken/lib/tool/module/JOptModule.java b/src/main/java/codechicken/lib/tool/module/JOptModule.java
similarity index 100%
rename from src/codechicken/lib/tool/module/JOptModule.java
rename to src/main/java/codechicken/lib/tool/module/JOptModule.java
diff --git a/src/codechicken/lib/tool/module/ModuleQBConverter.java b/src/main/java/codechicken/lib/tool/module/ModuleQBConverter.java
similarity index 100%
rename from src/codechicken/lib/tool/module/ModuleQBConverter.java
rename to src/main/java/codechicken/lib/tool/module/ModuleQBConverter.java
diff --git a/src/codechicken/lib/util/Copyable.java b/src/main/java/codechicken/lib/util/Copyable.java
similarity index 100%
rename from src/codechicken/lib/util/Copyable.java
rename to src/main/java/codechicken/lib/util/Copyable.java
diff --git a/src/codechicken/lib/util/LangProxy.java b/src/main/java/codechicken/lib/util/LangProxy.java
similarity index 100%
rename from src/codechicken/lib/util/LangProxy.java
rename to src/main/java/codechicken/lib/util/LangProxy.java
diff --git a/src/codechicken/lib/vec/AxisCycle.java b/src/main/java/codechicken/lib/vec/AxisCycle.java
similarity index 100%
rename from src/codechicken/lib/vec/AxisCycle.java
rename to src/main/java/codechicken/lib/vec/AxisCycle.java
diff --git a/src/codechicken/lib/vec/BlockCoord.java b/src/main/java/codechicken/lib/vec/BlockCoord.java
similarity index 100%
rename from src/codechicken/lib/vec/BlockCoord.java
rename to src/main/java/codechicken/lib/vec/BlockCoord.java
diff --git a/src/codechicken/lib/vec/Cuboid6.java b/src/main/java/codechicken/lib/vec/Cuboid6.java
similarity index 100%
rename from src/codechicken/lib/vec/Cuboid6.java
rename to src/main/java/codechicken/lib/vec/Cuboid6.java
diff --git a/src/codechicken/lib/vec/CuboidCoord.java b/src/main/java/codechicken/lib/vec/CuboidCoord.java
similarity index 100%
rename from src/codechicken/lib/vec/CuboidCoord.java
rename to src/main/java/codechicken/lib/vec/CuboidCoord.java
diff --git a/src/codechicken/lib/vec/ITransformation.java b/src/main/java/codechicken/lib/vec/ITransformation.java
similarity index 100%
rename from src/codechicken/lib/vec/ITransformation.java
rename to src/main/java/codechicken/lib/vec/ITransformation.java
diff --git a/src/codechicken/lib/vec/IrreversibleTransformationException.java b/src/main/java/codechicken/lib/vec/IrreversibleTransformationException.java
similarity index 100%
rename from src/codechicken/lib/vec/IrreversibleTransformationException.java
rename to src/main/java/codechicken/lib/vec/IrreversibleTransformationException.java
diff --git a/src/codechicken/lib/vec/Line3.java b/src/main/java/codechicken/lib/vec/Line3.java
similarity index 100%
rename from src/codechicken/lib/vec/Line3.java
rename to src/main/java/codechicken/lib/vec/Line3.java
diff --git a/src/codechicken/lib/vec/Matrix4.java b/src/main/java/codechicken/lib/vec/Matrix4.java
similarity index 100%
rename from src/codechicken/lib/vec/Matrix4.java
rename to src/main/java/codechicken/lib/vec/Matrix4.java
diff --git a/src/codechicken/lib/vec/Quat.java b/src/main/java/codechicken/lib/vec/Quat.java
similarity index 100%
rename from src/codechicken/lib/vec/Quat.java
rename to src/main/java/codechicken/lib/vec/Quat.java
diff --git a/src/codechicken/lib/vec/Rectangle4i.java b/src/main/java/codechicken/lib/vec/Rectangle4i.java
similarity index 100%
rename from src/codechicken/lib/vec/Rectangle4i.java
rename to src/main/java/codechicken/lib/vec/Rectangle4i.java
diff --git a/src/codechicken/lib/vec/RedundantTransformation.java b/src/main/java/codechicken/lib/vec/RedundantTransformation.java
similarity index 100%
rename from src/codechicken/lib/vec/RedundantTransformation.java
rename to src/main/java/codechicken/lib/vec/RedundantTransformation.java
diff --git a/src/codechicken/lib/vec/Rotation.java b/src/main/java/codechicken/lib/vec/Rotation.java
similarity index 100%
rename from src/codechicken/lib/vec/Rotation.java
rename to src/main/java/codechicken/lib/vec/Rotation.java
diff --git a/src/codechicken/lib/vec/Scale.java b/src/main/java/codechicken/lib/vec/Scale.java
similarity index 100%
rename from src/codechicken/lib/vec/Scale.java
rename to src/main/java/codechicken/lib/vec/Scale.java
diff --git a/src/codechicken/lib/vec/SwapYZ.java b/src/main/java/codechicken/lib/vec/SwapYZ.java
similarity index 100%
rename from src/codechicken/lib/vec/SwapYZ.java
rename to src/main/java/codechicken/lib/vec/SwapYZ.java
diff --git a/src/codechicken/lib/vec/Transformation.java b/src/main/java/codechicken/lib/vec/Transformation.java
similarity index 100%
rename from src/codechicken/lib/vec/Transformation.java
rename to src/main/java/codechicken/lib/vec/Transformation.java
diff --git a/src/codechicken/lib/vec/TransformationList.java b/src/main/java/codechicken/lib/vec/TransformationList.java
similarity index 100%
rename from src/codechicken/lib/vec/TransformationList.java
rename to src/main/java/codechicken/lib/vec/TransformationList.java
diff --git a/src/codechicken/lib/vec/Translation.java b/src/main/java/codechicken/lib/vec/Translation.java
similarity index 100%
rename from src/codechicken/lib/vec/Translation.java
rename to src/main/java/codechicken/lib/vec/Translation.java
diff --git a/src/codechicken/lib/vec/VariableTransformation.java b/src/main/java/codechicken/lib/vec/VariableTransformation.java
similarity index 100%
rename from src/codechicken/lib/vec/VariableTransformation.java
rename to src/main/java/codechicken/lib/vec/VariableTransformation.java
diff --git a/src/codechicken/lib/vec/Vector3.java b/src/main/java/codechicken/lib/vec/Vector3.java
similarity index 100%
rename from src/codechicken/lib/vec/Vector3.java
rename to src/main/java/codechicken/lib/vec/Vector3.java
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
new file mode 100644
index 0000000..0942acd
--- /dev/null
+++ b/src/main/resources/mcmod.info
@@ -0,0 +1,16 @@
+[
+    {
+        "modid": "${modId}",
+        "name": "${modName}",
+        "description": "This is a library of systems to help make various aspects of minecraft modding easier. It contains libraries for 3D math and transformations, model rendering, packets, config, colours, asm and a few other things.",
+        "version": "${modVersion}",
+        "mcversion": "${minecraftVersion}",
+        "url": "https://github.com/GTNewHorizons/CodeChickenLib",
+        "updateUrl": "",
+        "authorList": [ "Chicken-Bones", "GTNH-Team" ],
+        "credits": "",
+        "logoFile": "galacticraft_logo.png",
+        "screenshots": [],
+        "parent":""
+    },
+]