diff --git a/.github/scripts/test-no-crash-reports.sh b/.github/scripts/test-no-crash-reports.sh
new file mode 100644
index 0000000..c67e342
--- /dev/null
+++ b/.github/scripts/test-no-crash-reports.sh
@@ -0,0 +1,9 @@
+directory="run/crash-reports"
+if [ -d $directory ]; then
+  echo "Crash reports detected:"
+  cat $directory/*
+  exit 1
+else
+  echo "No crash reports detected"
+  exit 0
+fi
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
new file mode 100644
index 0000000..6c9b3cb
--- /dev/null
+++ b/.github/workflows/build-and-test.yml
@@ -0,0 +1,45 @@
+# 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 test
+
+on:
+  pull_request:
+    branches: [ master, main ]
+  push:
+    branches: [ master, main ]
+
+jobs:
+  build-and-test:
+    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
+
+    - name: Run server for 1 minute
+      run: |
+        mkdir run
+        echo "eula=true" > run/eula.txt  
+        timeout 10 ./gradlew runServer || true
+
+    - name: Test no crashes happend
+      run: |
+        chmod +x .github/scripts/test-no-crash-reports.sh
+        .github/scripts/test-no-crash-reports.sh
diff --git a/.github/workflows/release-tags.yml b/.github/workflows/release-tags.yml
new file mode 100644
index 0000000..25c354b
--- /dev/null
+++ b/.github/workflows/release-tags.yml
@@ -0,0 +1,45 @@
+# 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: Release tagged build
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set release version
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+
+      - 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
+
+      - name: Release under current tag
+        uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "${{ env.RELEASE_VERSION }}"
+          prerelease: false
+          title: "${{ env.RELEASE_VERSION }}"
+          files: build/libs/*.jar
diff --git a/.gitignore b/.gitignore
index 2dce6a6..558ad12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,28 @@
-/bin
-/out
-/build
-/run
-/.idea/workspace.xml
-/.idea/dictionaries
-/eclipse
-/.gradle
-/*.iml
-/*.ipr
-/.idea/libraries/Gradle__*
+.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
+/out/
+*.iml
+*.ipr
+*.iws
+src/main/resources/mixins.*.json
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index 3a8177a..0000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-11" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 5128f14..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ASMIdeaPluginConfiguration">
-    <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
-    <groovy codeStyle="LEGACY" />
-  </component>
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 2bd7a59..a380f6c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,19 @@
+//version: ffe7b130f98fdfa1ac7c6ba4bd34722a55ab28d4
+/*
+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 com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+import java.util.concurrent.TimeUnit
+
 buildscript {
-    configurations.all {
-        resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
-    }
     repositories {
-        mavenCentral()
-	mavenLocal()
         maven {
             name = "forge"
             url = "https://maven.minecraftforge.net"
@@ -13,150 +22,496 @@ buildscript {
             name = "sonatype"
             url = "https://oss.sonatype.org/content/repositories/snapshots/"
         }
+        maven {
+            name = "Scala CI dependencies"
+            url = "https://repo1.maven.org/maven2/"
+        }
+        maven {
+            name = "jitpack"
+            url = "https://jitpack.io"
+        }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+        classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.4'
     }
 }
 
-apply plugin: 'scala'
+plugins {
+    id 'idea'
+    id 'scala'
+    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: 'forge'
 
-file "build.properties" withReader {
-    def prop = new Properties()
-    prop.load(it)
-    ext.config = new ConfigSlurper().parse prop
+def projectJavaVersion = JavaLanguageVersion.of(8)
+
+java {
+    toolchain {
+        languageVersion.set(projectJavaVersion)
+    }
+}
+
+idea {
+    module {
+        inheritOutputDirs = true
+        downloadJavadoc = true
+        downloadSources = true
+    }
+}
+
+if(JavaVersion.current() != JavaVersion.VERSION_1_8) {
+    throw new GradleException("This project requires Java 8, but it's running on " + JavaVersion.current())
+}
+
+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 (project.hasProperty('forgeOverride')) {
-    config.forge.version = forgeOverride
+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 (project.hasProperty('buildnum')) {
-    ext.simpleVersion = "${config.neiaddons.version}.${project.buildnum}"
-} else {
-    ext.simpleVersion = "${config.neiaddons.version}-DEV"
+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)
+    }
 }
 
-version = simpleVersion + '-mc' + config.minecraft.version
+if(usesMixins.toBoolean()) {
+    if(mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) {
+        throw new GradleException("\"mixinPlugin\" requires \"mixinsPackage\" and \"mixinPlugin\" to be set!")
+    }
 
-group = "net.bdew"
-archivesBaseName = project.name
+    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
+try {
+    version = minecraftVersion + "-" + gitVersion()
+}
+catch (Exception e) {
+    throw new IllegalStateException("This mod must be version controlled by Git AND the repository must provide at least one tag!");
+}
+group = modGroup
+archivesBaseName = modId
 
 minecraft {
-    version = "1.7.10-10.13.2.1291"
-    replace("NEIADDONS_VER", simpleVersion.toString())
+    version = minecraftVersion + "-" + forgeVersion + "-" + minecraftVersion
+    runDir = "run"
+
+    if (replaceGradleTokenInFile) {
+        replaceIn replaceGradleTokenInFile
+        if(gradleTokenModId) {
+            replace gradleTokenModId, modId
+        }
+        if(gradleTokenModName) {
+            replace gradleTokenModName, modName
+        }
+        if(gradleTokenVersion) {
+            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 {
-    mavenCentral()
     maven {
-        name = "bdew"
-        url = "http://jenkins.bdew.net/maven"
+        name = "Overmind forge repo mirror"
+        url = "https://gregtech.overminddl1.com/"
     }
-    maven {
-        name = "chickenbones"
-        url = "http://chickenbones.net/maven"
+    if(usesMixins.toBoolean()) {
+        maven {
+            name = "sponge"
+            url = "https://repo.spongepowered.org/repository/maven-public"
+        }
+        maven {
+            url = "https://jitpack.io"
+        }
     }
-    maven {
-        name "waila"
-        url "http://mobiusstrip.eu/maven"
+}
+
+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")
     }
-    maven {
-        name = "player" // forestry here
-        url = "http://maven.ic2.player.to/"
+}
+
+apply from: 'dependencies.gradle'
+
+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/", "mixins." + modId + ".json").text = """{
+  "required": true,
+  "minVersion": "0.7.11",
+  "package": "${modGroup}.${mixinsPackage}",
+  "plugin": "${modGroup}.${mixinPlugin}",
+  "refmap": "${mixingConfigRefMap}",
+  "target": "@env(DEFAULT)",
+  "compatibilityLevel": "JAVA_8"
+}
+
+"""
     }
 }
 
-dependencies {
-    compile "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:dev"
-    compile "codechicken:CodeChickenLib:${config.minecraft.version}-${config.ccl.version}:dev"
-    compile "codechicken:CodeChickenCore:${config.minecraft.version}-${config.ccc.version}:dev"
+task relocateShadowJar(type: ConfigureShadowRelocation) {
+    target = tasks.shadowJar
+    prefix = modGroup + ".shadow"
+}
 
-    compile "net.sengir.forestry:forestry_${config.minecraft.version}:${config.forestry.version}:api"
+shadowJar {
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    minimize()  // This will only allow shading for actually used classes
+    configurations = [project.configurations.shadowImplementation]
+    dependsOn(relocateShadowJar)
+}
 
-    compile module("mcp.mobius.waila:Waila:${config.waila.version}_${config.minecraft.version}") {
-        transitive = false // WAILA is depending on an invalid combination of CCC/NEI that doesn't run...
+jar {
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    if(usesShadowedDependencies.toBoolean()) {
+        dependsOn(shadowJar)
+        enabled = false
     }
 }
 
-import org.apache.tools.ant.filters.ReplaceTokens
+reobf {
+    if(usesMixins.toBoolean()) {
+        addExtraSrgFile mixinSrg
+    }
+}
 
-sourceSets {
-    main {
-        scala {
-            srcDir 'src'
-        }
-        resources {
-            srcDir 'resources'
+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"
+            ]
         }
-        output.resourcesDir = output.classesDir // Hack for IDEA
     }
 }
 
+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)
+}
+
+tasks.withType(JavaExec).configureEach {
+    javaLauncher.set(
+            javaToolchains.launcherFor {
+                languageVersion = projectJavaVersion
+            }
+    )
+}
+
+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
+            }
 
-processResources {
-    inputs.property "tokens", minecraft.replacements
-    from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
-        filter(ReplaceTokens, tokens: minecraft.replacements)
+            if(usesMixins.toBoolean()) {
+                from refMap
+            }
+
+            // copy everything else, thats not the mcmod.info
+            from(sourceSets.main.resources.srcDirs) {
+                exclude 'mcmod.info'
+            }
+        }
+
+def getManifestAttributes() {
+    def manifestAttributes = [:]
+    if(containsMixinsAndOrCoreModOnly.toBoolean() == false && (usesMixins.toBoolean() || coreModClass)) {
+        manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
+    }
+
+    if(accessTransformersFile) {
+        manifestAttributes += ["FMLAT" : accessTransformersFile.toString()]
     }
 
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
+    if(coreModClass) {
+        manifestAttributes += ["FMLCorePlugin": modGroup + "." + coreModClass]
     }
+
+    if(usesMixins.toBoolean()) {
+        manifestAttributes += [
+                "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
+                "MixinConfigs" : "mixins." + modId + ".json",
+                "ForceLoadAsMod" : containsMixinsAndOrCoreModOnly.toBoolean() == false
+        ]
+    }
+    return manifestAttributes
 }
 
-task sourceJar(type: Jar) {
-    from sourceSets.main.allSource
-    classifier "sources"
+task sourcesJar(type: Jar) {
+    from (sourceSets.main.allJava)
+    from (file("$projectDir/LICENSE"))
+    getArchiveClassifier().set('sources')
 }
 
-task deobfJar(type: Jar) {
+task shadowDevJar(type: ShadowJar) {
     from sourceSets.main.output
-    exclude "**/*.psd"
-    classifier "dev"
-    duplicatesStrategy "exclude"
+    getArchiveClassifier().set("dev")
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    minimize()  // This will only allow shading for actually used classes
+    configurations = [project.configurations.shadowImplementation]
 }
 
-jar {
-    exclude "**/*.psd"
+task relocateShadowDevJar(type: ConfigureShadowRelocation) {
+    target = tasks.shadowDevJar
+    prefix = modGroup + ".shadow"
+}
+
+task circularResolverJar(type: Jar) {
+    dependsOn(relocateShadowDevJar)
+    dependsOn(shadowDevJar)
+    enabled = false
+}
+
+task devJar(type: Jar) {
+    from sourceSets.main.output
+    getArchiveClassifier().set("dev")
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    if(usesShadowedDependencies.toBoolean()) {
+        dependsOn(circularResolverJar)
+        enabled = false
+    }
+}
+
+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 sourceJar
-    archives deobfJar
+    archives sourcesJar
+    archives devJar
+    if(apiPackage) {
+        archives apiJar
+    }
 }
 
-apply plugin: 'maven-publish'
+// Updating
+task updateBuildScript {
+    doLast {
+        if (updateBuildScript()) return
 
-publishing {
-    publications {
-        maven(MavenPublication) {
-            artifact deobfJar
-            artifact sourceJar
-        }
+        print("Build script already up-to-date!")
     }
-    repositories {
-        maven {
-            url "file://var/www/maven"
-        }
+}
+
+if (isNewBuildScriptVersionAvailable()) {
+    if (autoUpdateBuildScript.toBoolean()) {
+        updateBuildScript()
+    } else {
+        println("Build script update available! Run 'gradle updateBuildScript'")
     }
 }
 
-apply plugin: 'curseforge'
+static URL availableBuildScriptUrl() {
+    new URL("https://raw.githubusercontent.com/SinTh0r4s/ExampleMod1.7.10/main/build.gradle")
+}
 
-curse {
-    projectId = config.curseforge.id
-    apiKey = project.hasProperty("curseForgeApiKey") ? project.curseForgeApiKey : ""
-    releaseType = 'alpha'
+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)
 
-    artifact = jar
-    changelog = project.hasProperty("changelog") ? project.changelog : "No changelog available"
+    boolean isUpToDate = currentBuildScriptHash.empty || availableBuildScriptHash.empty || currentBuildScriptHash == availableBuildScriptHash
+    return !isUpToDate
+}
 
-    additionalArtifact deobfJar
-    additionalArtifact sourceJar
+static String getVersionHash(String buildScriptContent) {
+    String versionLine = buildScriptContent.find("^//version: [a-z0-9]*")
+    if(versionLine != null) {
+        return versionLine.split(": ").last()
+    }
+    return ""
+}
 
-    relatedProject 'notenoughitems': 'optionalLibrary'
-    relatedProject 'waila': 'optionalLibrary'
-}
\ No newline at end of file
+configure(updateBuildScript) {
+    group = 'forgegradle'
+    description = 'Updates the build script to the latest version'
+}
diff --git a/build.properties b/build.properties
deleted file mode 100644
index 4d37b7b..0000000
--- a/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-neiaddons.version=1.12.15
-curseforge.id=63352
-
-minecraft.version=1.7.10
-forge.version=10.13.4.1558-1.7.10
-
-nei.version=1.0.5.118
-ccl.version=1.1.3.140
-ccc.version=1.0.7.47
-waila.version=1.5.10
-
-forestry.version=4.2.1.48
-
-
diff --git a/dependencies.gradle b/dependencies.gradle
new file mode 100644
index 0000000..ac56448
--- /dev/null
+++ b/dependencies.gradle
@@ -0,0 +1,6 @@
+// Add your dependencies here
+
+dependencies {
+    compile("com.github.GTNewHorizons:ForestryMC:master-SNAPSHOT:dev")
+    compile("com.github.GTNewHorizons:waila:master-SNAPSHOT:dev")
+}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..8a7eb06
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,60 @@
+modName = NEI Addons
+
+# This is a case-sensitive string to identify your mod. Convention is to use lower case.
+modId = NEIAddons
+
+modGroup = net.bdew.neiaddons
+
+# 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 = NEIAddons.java
+gradleTokenModId =
+gradleTokenModName =
+gradleTokenVersion = GRADLETOKEN_VERSION
+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 = neiaddons_at.cfg
+
+# 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 IMixinConfigPlugin. 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
index b761216..5c2d1cf 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 458cbfc..3ab0b72 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Wed Jul 02 15:54:47 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=https\://services.gradle.org/distributions/gradle-2.9-bin.zip
diff --git a/gradlew b/gradlew
index 91a7e26..83f2acf 100755
--- a/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,20 +22,38 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+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 ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -30,6 +64,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +75,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=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"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -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 "$@")
+
+# 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" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 8a0b282..9618d8d 100644
--- a/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..ac9b07c
--- /dev/null
+++ b/repositories.gradle
@@ -0,0 +1,15 @@
+// Add any additional repositories for your dependencies here
+
+repositories {
+    maven {
+        name = "ic2"
+        url = "http://maven.ic2.player.to/"
+        metadataSources {
+            mavenPom()
+            artifact()
+        }
+    }
+    maven {
+        url = "https://jitpack.io"
+    }
+}
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 5afe048..0000000
--- a/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = 'neiaddons'
\ No newline at end of file
diff --git a/src/main/resources/neiaddons_at.cfg b/src/main/resources/META-INF/neiaddons_at.cfg
similarity index 100%
rename from src/main/resources/neiaddons_at.cfg
rename to src/main/resources/META-INF/neiaddons_at.cfg
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index 7e93cee..9029d3f 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -1,9 +1,10 @@
 [
 {
-  "modid": "NEIAddons",
-  "name": "NEI Addons",
+  "modid": "${modId}",
+  "name": "${modName}",
   "description": "",
-  "version": "@NEIADDONS_VER@",
+  "version": "${modVersion}",
+  "mcversion": "${minecraftVersion}",
   "url": "bdew.net/neiaddons",
   "updateUrl": "",
   "authorList": [
@@ -18,10 +19,11 @@
   ]
 },
 {
-  "modid": "NEIAddons|Forestry",
-  "name": "NEI Addons: Forestry",
+  "modid": "${modId}|Forestry",
+  "name": "${modName}: Forestry",
   "description": "",
-  "version": "@NEIADDONS_VER@",
+  "version": "${modVersion}",
+  "mcversion": "${minecraftVersion}",
   "url": "http://bdew.net/neiaddons/",
   "updateUrl": "",
   "authorList": [
@@ -37,10 +39,11 @@
   ]
 },
 {
-  "modid": "NEIAddons|CraftingTables",
-  "name": "NEI Addons: Crafting Tables",
+  "modid": "${modId}|CraftingTables",
+  "name": "${modName}: Crafting Tables",
   "description": "",
-  "version": "@NEIADDONS_VER@",
+  "version": "${modVersion}",
+  "mcversion": "${minecraftVersion}",
   "url": "http://bdew.net/neiaddons/",
   "updateUrl": "",
   "authorList": [
@@ -56,10 +59,11 @@
   ]
 },
 {
-  "modid": "NEIAddons|AE",
-  "name": "NEI Addons: Applied Energistics",
+  "modid": "${modId}|AE",
+  "name": "${modName}: Applied Energistics",
   "description": "",
-  "version": "@NEIADDONS_VER@",
+  "version": "${modVersion}",
+  "mcversion": "${minecraftVersion}",
   "url": "http://bdew.net/neiaddons/",
   "updateUrl": "",
   "authorList": [
@@ -75,10 +79,11 @@
   ]
 },
 {
-  "modid": "NEIAddons|ExtraBees",
-  "name": "NEI Addons: Extra Bees",
+  "modid": "${modId}|ExtraBees",
+  "name": "${modName}: Extra Bees",
   "description": "",
-  "version": "@NEIADDONS_VER@",
+  "version": "${modVersion}",
+  "mcversion": "${minecraftVersion}",
   "url": "http://bdew.net/neiaddons/",
   "updateUrl": "",
   "authorList": [
@@ -94,10 +99,11 @@
   ]
 },
 {
-  "modid": "NEIAddons|MiscPeripherals",
-  "name": "NEI Addons: Misc Peripherals",
+  "modid": "${modId}|MiscPeripherals",
+  "name": "${modName}: Misc Peripherals",
   "description": "",
-  "version": "@NEIADDONS_VER@",
+  "version": "${modVersion}",
+  "mcversion": "${minecraftVersion}",
   "url": "http://bdew.net/neiaddons/",
   "updateUrl": "",
   "authorList": [
@@ -113,10 +119,11 @@
   ]
 },
 {
-  "modid": "NEIAddons|ExNihilo",
-  "name": "NEI Addons: Ex Nihilo",
+  "modid": "${modId}|ExNihilo",
+  "name": "${modName}: Ex Nihilo",
   "description": "",
-  "version": "@NEIADDONS_VER@",
+  "version": "${modVersion}",
+  "mcversion": "${minecraftVersion}",
   "url": "http://bdew.net/neiaddons/",
   "updateUrl": "",
   "authorList": [
diff --git a/src/main/java/net/bdew/neiaddons/BaseAddon.java b/src/main/scala/net/bdew/neiaddons/BaseAddon.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/BaseAddon.java
rename to src/main/scala/net/bdew/neiaddons/BaseAddon.java
diff --git a/src/main/java/net/bdew/neiaddons/NEIAddons.java b/src/main/scala/net/bdew/neiaddons/NEIAddons.java
similarity index 94%
rename from src/main/java/net/bdew/neiaddons/NEIAddons.java
rename to src/main/scala/net/bdew/neiaddons/NEIAddons.java
index 4121f32..fb2c23a 100644
--- a/src/main/java/net/bdew/neiaddons/NEIAddons.java
+++ b/src/main/scala/net/bdew/neiaddons/NEIAddons.java
@@ -26,10 +26,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-@Mod(modid = NEIAddons.modId, name = "NEI Addons", version = "NEIADDONS_VER", dependencies = "after:NotEnoughItems")
+@Mod(modid = NEIAddons.modId, name = NEIAddons.modName, version = NEIAddons.modVersion, dependencies = "after:NotEnoughItems")
 public class NEIAddons {
 
+    public static final String modVersion = "GRADLETOKEN_VERSION";
     public static final String modId = "NEIAddons";
+    public static final String modName = "NEI Addons";
     public static final String channelId = "bdew.neiaddons";
     public static final int netVersion = 1;
 
diff --git a/src/main/java/net/bdew/neiaddons/NEIAddonsConfig.java b/src/main/scala/net/bdew/neiaddons/NEIAddonsConfig.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/NEIAddonsConfig.java
rename to src/main/scala/net/bdew/neiaddons/NEIAddonsConfig.java
diff --git a/src/main/java/net/bdew/neiaddons/Utils.java b/src/main/scala/net/bdew/neiaddons/Utils.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/Utils.java
rename to src/main/scala/net/bdew/neiaddons/Utils.java
diff --git a/src/main/java/net/bdew/neiaddons/api/NEIAddon.java b/src/main/scala/net/bdew/neiaddons/api/NEIAddon.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/api/NEIAddon.java
rename to src/main/scala/net/bdew/neiaddons/api/NEIAddon.java
diff --git a/src/main/java/net/bdew/neiaddons/api/SubPacketHandler.java b/src/main/scala/net/bdew/neiaddons/api/SubPacketHandler.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/api/SubPacketHandler.java
rename to src/main/scala/net/bdew/neiaddons/api/SubPacketHandler.java
diff --git a/src/main/java/net/bdew/neiaddons/appeng/AddonAppeng.java b/src/main/scala/net/bdew/neiaddons/appeng/AddonAppeng.java
similarity index 93%
rename from src/main/java/net/bdew/neiaddons/appeng/AddonAppeng.java
rename to src/main/scala/net/bdew/neiaddons/appeng/AddonAppeng.java
index 6904d07..23afd80 100644
--- a/src/main/java/net/bdew/neiaddons/appeng/AddonAppeng.java
+++ b/src/main/scala/net/bdew/neiaddons/appeng/AddonAppeng.java
@@ -25,7 +25,7 @@
 
 import java.lang.reflect.Method;
 
-@Mod(modid = NEIAddons.modId + "|AppEng", name = "NEI Addons: Applied Energistics 2", version = "NEIADDONS_VER", dependencies = "after:NEIAddons;after:appliedenergistics2")
+@Mod(modid = NEIAddons.modId + "|AppEng", name = NEIAddons.modName + ": Applied Energistics 2", version = NEIAddons.modVersion, dependencies = "after:NEIAddons;after:appliedenergistics2")
 public class AddonAppeng extends BaseAddon {
 
     @Instance(NEIAddons.modId + "|AppEng")
diff --git a/src/main/java/net/bdew/neiaddons/appeng/AppEngGuiHandler.java b/src/main/scala/net/bdew/neiaddons/appeng/AppEngGuiHandler.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/appeng/AppEngGuiHandler.java
rename to src/main/scala/net/bdew/neiaddons/appeng/AppEngGuiHandler.java
diff --git a/src/main/java/net/bdew/neiaddons/appeng/AppEngHelper.java b/src/main/scala/net/bdew/neiaddons/appeng/AppEngHelper.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/appeng/AppEngHelper.java
rename to src/main/scala/net/bdew/neiaddons/appeng/AppEngHelper.java
diff --git a/src/main/java/net/bdew/neiaddons/appeng/SetFakeSlotCommandHandler.java b/src/main/scala/net/bdew/neiaddons/appeng/SetFakeSlotCommandHandler.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/appeng/SetFakeSlotCommandHandler.java
rename to src/main/scala/net/bdew/neiaddons/appeng/SetFakeSlotCommandHandler.java
diff --git a/src/main/java/net/bdew/neiaddons/appeng/SlotHelper.java b/src/main/scala/net/bdew/neiaddons/appeng/SlotHelper.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/appeng/SlotHelper.java
rename to src/main/scala/net/bdew/neiaddons/appeng/SlotHelper.java
diff --git a/src/main/java/net/bdew/neiaddons/botany/AddonBotany.java b/src/main/scala/net/bdew/neiaddons/botany/AddonBotany.java
similarity index 93%
rename from src/main/java/net/bdew/neiaddons/botany/AddonBotany.java
rename to src/main/scala/net/bdew/neiaddons/botany/AddonBotany.java
index 971c396..ad232b9 100644
--- a/src/main/java/net/bdew/neiaddons/botany/AddonBotany.java
+++ b/src/main/scala/net/bdew/neiaddons/botany/AddonBotany.java
@@ -21,7 +21,7 @@
 import net.bdew.neiaddons.botany.flowers.FlowerHelper;
 import net.minecraft.client.resources.I18n;
 
-@Mod(modid = NEIAddons.modId + "|Botany", name = "NEI Addons: Botany", version = "NEIADDONS_VER", dependencies = "after:NEIAddons;after:Botany")
+@Mod(modid = NEIAddons.modId + "|Botany", name = NEIAddons.modName + ": Botany", version = NEIAddons.modVersion, dependencies = "after:NEIAddons;after:Botany")
 public class AddonBotany extends BaseAddon {
     public static boolean showFlowerMutations;
     public static boolean loadBlacklisted;
diff --git a/src/main/java/net/bdew/neiaddons/botany/flowers/FlowerBreedingHandler.java b/src/main/scala/net/bdew/neiaddons/botany/flowers/FlowerBreedingHandler.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/botany/flowers/FlowerBreedingHandler.java
rename to src/main/scala/net/bdew/neiaddons/botany/flowers/FlowerBreedingHandler.java
diff --git a/src/main/java/net/bdew/neiaddons/botany/flowers/FlowerHelper.java b/src/main/scala/net/bdew/neiaddons/botany/flowers/FlowerHelper.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/botany/flowers/FlowerHelper.java
rename to src/main/scala/net/bdew/neiaddons/botany/flowers/FlowerHelper.java
diff --git a/src/main/java/net/bdew/neiaddons/crafting/AddonCraftingTables.java b/src/main/scala/net/bdew/neiaddons/crafting/AddonCraftingTables.java
similarity index 93%
rename from src/main/java/net/bdew/neiaddons/crafting/AddonCraftingTables.java
rename to src/main/scala/net/bdew/neiaddons/crafting/AddonCraftingTables.java
index 4646b3a..dcf77c8 100644
--- a/src/main/java/net/bdew/neiaddons/crafting/AddonCraftingTables.java
+++ b/src/main/scala/net/bdew/neiaddons/crafting/AddonCraftingTables.java
@@ -17,12 +17,13 @@
 import net.bdew.neiaddons.BaseAddon;
 import net.bdew.neiaddons.NEIAddons;
 import net.bdew.neiaddons.Utils;
+import net.bdew.neiaddons.api.NEIAddon;
 import net.minecraft.client.gui.inventory.GuiContainer;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-@Mod(modid = NEIAddons.modId + "|CraftingTables", name = "NEI Addons: Crafting Tables", version = "NEIADDONS_VER", dependencies = "after:NEIAddons")
+@Mod(modid = NEIAddons.modId + "|CraftingTables", name = NEIAddons.modName + ": Crafting Tables", version = NEIAddons.modVersion, dependencies = "after:NEIAddons")
 public class AddonCraftingTables extends BaseAddon {
 
     public static Collection<Class<? extends GuiContainer>> craftingTables;
diff --git a/src/main/java/net/bdew/neiaddons/crafting/AddonCraftingTablesClient.java b/src/main/scala/net/bdew/neiaddons/crafting/AddonCraftingTablesClient.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/crafting/AddonCraftingTablesClient.java
rename to src/main/scala/net/bdew/neiaddons/crafting/AddonCraftingTablesClient.java
diff --git a/src/main/java/net/bdew/neiaddons/developer/AddonDeveloper.java b/src/main/scala/net/bdew/neiaddons/developer/AddonDeveloper.java
similarity index 89%
rename from src/main/java/net/bdew/neiaddons/developer/AddonDeveloper.java
rename to src/main/scala/net/bdew/neiaddons/developer/AddonDeveloper.java
index dae61fc..c7a4b5c 100644
--- a/src/main/java/net/bdew/neiaddons/developer/AddonDeveloper.java
+++ b/src/main/scala/net/bdew/neiaddons/developer/AddonDeveloper.java
@@ -18,7 +18,7 @@
 import net.bdew.neiaddons.BaseAddon;
 import net.bdew.neiaddons.NEIAddons;
 
-@Mod(modid = NEIAddons.modId + "|Developer", name = "NEI Addons: Developer Tools", version = "NEIADDONS_VER", dependencies = "after:NEIAddons")
+@Mod(modid = NEIAddons.modId + "|Developer", name = NEIAddons.modName + ": Developer Tools", version = NEIAddons.modVersion, dependencies = "after:NEIAddons")
 public class AddonDeveloper extends BaseAddon {
 
     @Instance(NEIAddons.modId + "|Developer")
diff --git a/src/main/java/net/bdew/neiaddons/developer/DeveloperGuiHandler.java b/src/main/scala/net/bdew/neiaddons/developer/DeveloperGuiHandler.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/developer/DeveloperGuiHandler.java
rename to src/main/scala/net/bdew/neiaddons/developer/DeveloperGuiHandler.java
diff --git a/src/main/java/net/bdew/neiaddons/developer/DeveloperHelper.java b/src/main/scala/net/bdew/neiaddons/developer/DeveloperHelper.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/developer/DeveloperHelper.java
rename to src/main/scala/net/bdew/neiaddons/developer/DeveloperHelper.java
diff --git a/src/main/java/net/bdew/neiaddons/exnihilo/AddonExnihilo.java b/src/main/scala/net/bdew/neiaddons/exnihilo/AddonExnihilo.java
similarity index 91%
rename from src/main/java/net/bdew/neiaddons/exnihilo/AddonExnihilo.java
rename to src/main/scala/net/bdew/neiaddons/exnihilo/AddonExnihilo.java
index 2eb7733..baa826a 100644
--- a/src/main/java/net/bdew/neiaddons/exnihilo/AddonExnihilo.java
+++ b/src/main/scala/net/bdew/neiaddons/exnihilo/AddonExnihilo.java
@@ -18,7 +18,7 @@
 import net.bdew.neiaddons.BaseAddon;
 import net.bdew.neiaddons.NEIAddons;
 
-@Mod(modid = NEIAddons.modId + "|ExNihilo", name = "NEI Addons: Ex Nihilo", version = "NEIADDONS_VER", dependencies = "after:exnihilo")
+@Mod(modid = NEIAddons.modId + "|ExNihilo", name = NEIAddons.modName + ": Ex Nihilo", version = NEIAddons.modVersion, dependencies = "after:exnihilo")
 public class AddonExnihilo extends BaseAddon {
     @Mod.Instance(NEIAddons.modId + "|ExNihilo")
     public static AddonExnihilo instance;
diff --git a/src/main/java/net/bdew/neiaddons/exnihilo/WailaHandler.java b/src/main/scala/net/bdew/neiaddons/exnihilo/WailaHandler.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/exnihilo/WailaHandler.java
rename to src/main/scala/net/bdew/neiaddons/exnihilo/WailaHandler.java
diff --git a/src/main/java/net/bdew/neiaddons/exnihilo/waila/BarrelHandler.java b/src/main/scala/net/bdew/neiaddons/exnihilo/waila/BarrelHandler.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/exnihilo/waila/BarrelHandler.java
rename to src/main/scala/net/bdew/neiaddons/exnihilo/waila/BarrelHandler.java
diff --git a/src/main/java/net/bdew/neiaddons/exnihilo/waila/BeeTrapHandler.java b/src/main/scala/net/bdew/neiaddons/exnihilo/waila/BeeTrapHandler.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/exnihilo/waila/BeeTrapHandler.java
rename to src/main/scala/net/bdew/neiaddons/exnihilo/waila/BeeTrapHandler.java
diff --git a/src/main/java/net/bdew/neiaddons/exnihilo/waila/CrucibleHandler.java b/src/main/scala/net/bdew/neiaddons/exnihilo/waila/CrucibleHandler.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/exnihilo/waila/CrucibleHandler.java
rename to src/main/scala/net/bdew/neiaddons/exnihilo/waila/CrucibleHandler.java
diff --git a/src/main/java/net/bdew/neiaddons/forestry/AddonForestry.java b/src/main/scala/net/bdew/neiaddons/forestry/AddonForestry.java
similarity index 96%
rename from src/main/java/net/bdew/neiaddons/forestry/AddonForestry.java
rename to src/main/scala/net/bdew/neiaddons/forestry/AddonForestry.java
index 0b62fb8..b178bce 100644
--- a/src/main/java/net/bdew/neiaddons/forestry/AddonForestry.java
+++ b/src/main/scala/net/bdew/neiaddons/forestry/AddonForestry.java
@@ -23,7 +23,7 @@
 import net.bdew.neiaddons.forestry.trees.TreeHelper;
 import net.minecraft.client.resources.I18n;
 
-@Mod(modid = NEIAddons.modId + "|Forestry", name = "NEI Addons: Forestry", version = "NEIADDONS_VER", dependencies = "after:NEIAddons;after:Forestry")
+@Mod(modid = NEIAddons.modId + "|Forestry", name = NEIAddons.modName + ": Forestry", version = NEIAddons.modVersion, dependencies = "after:NEIAddons;after:Forestry")
 public class AddonForestry extends BaseAddon {
     public static boolean showSecret;
     public static boolean addBees;
diff --git a/src/main/java/net/bdew/neiaddons/forestry/BaseBreedingRecipeHandler.java b/src/main/scala/net/bdew/neiaddons/forestry/BaseBreedingRecipeHandler.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/forestry/BaseBreedingRecipeHandler.java
rename to src/main/scala/net/bdew/neiaddons/forestry/BaseBreedingRecipeHandler.java
diff --git a/src/main/java/net/bdew/neiaddons/forestry/BaseProduceRecipeHandler.java b/src/main/scala/net/bdew/neiaddons/forestry/BaseProduceRecipeHandler.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/forestry/BaseProduceRecipeHandler.java
rename to src/main/scala/net/bdew/neiaddons/forestry/BaseProduceRecipeHandler.java
diff --git a/src/main/java/net/bdew/neiaddons/forestry/GeneticsUtils.java b/src/main/scala/net/bdew/neiaddons/forestry/GeneticsUtils.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/forestry/GeneticsUtils.java
rename to src/main/scala/net/bdew/neiaddons/forestry/GeneticsUtils.java
diff --git a/src/main/java/net/bdew/neiaddons/forestry/MutationDumper.scala b/src/main/scala/net/bdew/neiaddons/forestry/MutationDumper.scala
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/forestry/MutationDumper.scala
rename to src/main/scala/net/bdew/neiaddons/forestry/MutationDumper.scala
diff --git a/src/main/java/net/bdew/neiaddons/forestry/bees/BeeBreedingHandler.java b/src/main/scala/net/bdew/neiaddons/forestry/bees/BeeBreedingHandler.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/forestry/bees/BeeBreedingHandler.java
rename to src/main/scala/net/bdew/neiaddons/forestry/bees/BeeBreedingHandler.java
diff --git a/src/main/java/net/bdew/neiaddons/forestry/bees/BeeHelper.java b/src/main/scala/net/bdew/neiaddons/forestry/bees/BeeHelper.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/forestry/bees/BeeHelper.java
rename to src/main/scala/net/bdew/neiaddons/forestry/bees/BeeHelper.java
diff --git a/src/main/java/net/bdew/neiaddons/forestry/bees/BeeProduceHandler.java b/src/main/scala/net/bdew/neiaddons/forestry/bees/BeeProduceHandler.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/forestry/bees/BeeProduceHandler.java
rename to src/main/scala/net/bdew/neiaddons/forestry/bees/BeeProduceHandler.java
diff --git a/src/main/java/net/bdew/neiaddons/forestry/butterflies/ButterflyBreedingHandler.java b/src/main/scala/net/bdew/neiaddons/forestry/butterflies/ButterflyBreedingHandler.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/forestry/butterflies/ButterflyBreedingHandler.java
rename to src/main/scala/net/bdew/neiaddons/forestry/butterflies/ButterflyBreedingHandler.java
diff --git a/src/main/java/net/bdew/neiaddons/forestry/butterflies/ButterflyHelper.java b/src/main/scala/net/bdew/neiaddons/forestry/butterflies/ButterflyHelper.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/forestry/butterflies/ButterflyHelper.java
rename to src/main/scala/net/bdew/neiaddons/forestry/butterflies/ButterflyHelper.java
diff --git a/src/main/java/net/bdew/neiaddons/forestry/trees/TreeBreedingHandler.java b/src/main/scala/net/bdew/neiaddons/forestry/trees/TreeBreedingHandler.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/forestry/trees/TreeBreedingHandler.java
rename to src/main/scala/net/bdew/neiaddons/forestry/trees/TreeBreedingHandler.java
diff --git a/src/main/java/net/bdew/neiaddons/forestry/trees/TreeHelper.java b/src/main/scala/net/bdew/neiaddons/forestry/trees/TreeHelper.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/forestry/trees/TreeHelper.java
rename to src/main/scala/net/bdew/neiaddons/forestry/trees/TreeHelper.java
diff --git a/src/main/java/net/bdew/neiaddons/forestry/trees/TreeProduceHandler.java b/src/main/scala/net/bdew/neiaddons/forestry/trees/TreeProduceHandler.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/forestry/trees/TreeProduceHandler.java
rename to src/main/scala/net/bdew/neiaddons/forestry/trees/TreeProduceHandler.java
diff --git a/src/main/java/net/bdew/neiaddons/network/ClientHandler.java b/src/main/scala/net/bdew/neiaddons/network/ClientHandler.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/network/ClientHandler.java
rename to src/main/scala/net/bdew/neiaddons/network/ClientHandler.java
diff --git a/src/main/java/net/bdew/neiaddons/network/NBTMessageCodec.java b/src/main/scala/net/bdew/neiaddons/network/NBTMessageCodec.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/network/NBTMessageCodec.java
rename to src/main/scala/net/bdew/neiaddons/network/NBTMessageCodec.java
diff --git a/src/main/java/net/bdew/neiaddons/network/NetChannel.java b/src/main/scala/net/bdew/neiaddons/network/NetChannel.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/network/NetChannel.java
rename to src/main/scala/net/bdew/neiaddons/network/NetChannel.java
diff --git a/src/main/java/net/bdew/neiaddons/network/PacketHelper.java b/src/main/scala/net/bdew/neiaddons/network/PacketHelper.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/network/PacketHelper.java
rename to src/main/scala/net/bdew/neiaddons/network/PacketHelper.java
diff --git a/src/main/java/net/bdew/neiaddons/network/ServerHandler.java b/src/main/scala/net/bdew/neiaddons/network/ServerHandler.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/network/ServerHandler.java
rename to src/main/scala/net/bdew/neiaddons/network/ServerHandler.java
diff --git a/src/main/java/net/bdew/neiaddons/utils/CustomOverlayHandler.java b/src/main/scala/net/bdew/neiaddons/utils/CustomOverlayHandler.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/utils/CustomOverlayHandler.java
rename to src/main/scala/net/bdew/neiaddons/utils/CustomOverlayHandler.java
diff --git a/src/main/java/net/bdew/neiaddons/utils/ItemStackWithTip.java b/src/main/scala/net/bdew/neiaddons/utils/ItemStackWithTip.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/utils/ItemStackWithTip.java
rename to src/main/scala/net/bdew/neiaddons/utils/ItemStackWithTip.java
diff --git a/src/main/java/net/bdew/neiaddons/utils/LabeledPositionedStack.java b/src/main/scala/net/bdew/neiaddons/utils/LabeledPositionedStack.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/utils/LabeledPositionedStack.java
rename to src/main/scala/net/bdew/neiaddons/utils/LabeledPositionedStack.java
diff --git a/src/main/java/net/bdew/neiaddons/utils/ModItemFilter.java b/src/main/scala/net/bdew/neiaddons/utils/ModItemFilter.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/utils/ModItemFilter.java
rename to src/main/scala/net/bdew/neiaddons/utils/ModItemFilter.java
diff --git a/src/main/java/net/bdew/neiaddons/utils/PositionedStackWithTip.java b/src/main/scala/net/bdew/neiaddons/utils/PositionedStackWithTip.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/utils/PositionedStackWithTip.java
rename to src/main/scala/net/bdew/neiaddons/utils/PositionedStackWithTip.java
diff --git a/src/main/java/net/bdew/neiaddons/utils/SetRecipeCommandHandler.java b/src/main/scala/net/bdew/neiaddons/utils/SetRecipeCommandHandler.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/utils/SetRecipeCommandHandler.java
rename to src/main/scala/net/bdew/neiaddons/utils/SetRecipeCommandHandler.java
diff --git a/src/main/java/net/bdew/neiaddons/utils/TypedField.java b/src/main/scala/net/bdew/neiaddons/utils/TypedField.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/utils/TypedField.java
rename to src/main/scala/net/bdew/neiaddons/utils/TypedField.java
diff --git a/src/main/java/net/bdew/neiaddons/utils/TypedMethod.java b/src/main/scala/net/bdew/neiaddons/utils/TypedMethod.java
similarity index 100%
rename from src/main/java/net/bdew/neiaddons/utils/TypedMethod.java
rename to src/main/scala/net/bdew/neiaddons/utils/TypedMethod.java