update build script

2026-10-25 20:22:31 +00:00 · 2022-02-05 10:42:23 -06:00
1 parent cbef2aa18d
commit 1e607d9243
@@ -0,0 +1,27 @@
+if [[ -d "run/crash-reports" ]]; then
+  echo "Crash reports detected:"
+  cat $directory/*
+  exit 1
+fi
+
+if grep --quiet "Fatal errors were detected" server.log; then
+  echo "Fatal errors detected:"
+  cat server.log
+  exit 1
+fi
+
+if grep --quiet "The state engine was in incorrect state ERRORED and forced into state SERVER_STOPPED" server.log; then
+  echo "Server force stopped:"
+  cat server.log
+  exit 1
+fi
+
+if grep --quiet 'Done .+ For help, type "help" or "?"' server.log; then
+  echo "Server didn't finish startup:"
+  cat server.log
+  exit 1
+fi
+
+echo "No crash reports detected"
+exit 0
+
@@ -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.5 minutes
+      run: |
+        mkdir run
+        echo "eula=true" > run/eula.txt  
+        timeout 90 ./gradlew runServer | tee --append server.log || true
+
+    - name: Test no errors reported during server run
+      run: |
+        chmod +x .github/scripts/test-no-error-reports.sh
+        .github/scripts/test-no-error-reports.sh
@@ -0,0 +1,51 @@
+# 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
+
+      - name: Publish to Maven
+        run: ./gradlew publish
+        env:
+          MAVEN_USER: ${{ secrets.MAVEN_USER }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
@@ -1,27 +1,31 @@
-# General use .gitignore for Minecraft modding.
-
-# Directories
-/.gradle/
+.gradle
+.settings
+/.idea/
+/run/
 /build/
 /eclipse/
-/run/
-/out/
-/asm/
+.classpath
+.project
 /bin/
-/.idea/
-/.metadata/
-/.settings/
-/libs/
-
-# File Extensions
-*.psd
+/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
-*.classpath
-*.project
-*.class
-
-# Specific files
-Thumbs.db
+src/main/resources/mixins.*.json
 *.bat
+*.DS_Store
+!gradlew.bat
@@ -0,0 +1,3 @@
+# Any Github changes require admin approval
+/.github/** @GTNewHorizons/admin
+
@@ -0,0 +1,395 @@
+Attribution 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+     Considerations for licensors: Our public licenses are
+     intended for use by those authorized to give the public
+     permission to use material in ways otherwise restricted by
+     copyright and certain other rights. Our licenses are
+     irrevocable. Licensors should read and understand the terms
+     and conditions of the license they choose before applying it.
+     Licensors should also secure all rights necessary before
+     applying our licenses so that the public can reuse the
+     material as expected. Licensors should clearly mark any
+     material not subject to the license. This includes other CC-
+     licensed material, or material used under an exception or
+     limitation to copyright. More considerations for licensors:
+    wiki.creativecommons.org/Considerations_for_licensors
+
+     Considerations for the public: By using one of our public
+     licenses, a licensor grants the public permission to use the
+     licensed material under specified terms and conditions. If
+     the licensor's permission is not necessary for any reason--for
+     example, because of any applicable exception or limitation to
+     copyright--then that use is not regulated by the license. Our
+     licenses grant only permissions under copyright and certain
+     other rights that a licensor has authority to grant. Use of
+     the licensed material may still be restricted for other
+     reasons, including because others have copyright or other
+     rights in the material. A licensor may make special requests,
+     such as asking that all changes be marked or described.
+     Although not required by our licenses, you are encouraged to
+     respect those requests where reasonable. More considerations
+     for the public:
+    wiki.creativecommons.org/Considerations_for_licensees
+
+=======================================================================
+
+Creative Commons Attribution 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution 4.0 International Public License ("Public License"). To the
+extent this Public License may be interpreted as a contract, You are
+granted the Licensed Rights in consideration of Your acceptance of
+these terms and conditions, and the Licensor grants You such rights in
+consideration of benefits the Licensor receives from making the
+Licensed Material available under these terms and conditions.
+
+
+Section 1 -- Definitions.
+
+  a. Adapted Material means material subject to Copyright and Similar
+     Rights that is derived from or based upon the Licensed Material
+     and in which the Licensed Material is translated, altered,
+     arranged, transformed, or otherwise modified in a manner requiring
+     permission under the Copyright and Similar Rights held by the
+     Licensor. For purposes of this Public License, where the Licensed
+     Material is a musical work, performance, or sound recording,
+     Adapted Material is always produced where the Licensed Material is
+     synched in timed relation with a moving image.
+
+  b. Adapter's License means the license You apply to Your Copyright
+     and Similar Rights in Your contributions to Adapted Material in
+     accordance with the terms and conditions of this Public License.
+
+  c. Copyright and Similar Rights means copyright and/or similar rights
+     closely related to copyright including, without limitation,
+     performance, broadcast, sound recording, and Sui Generis Database
+     Rights, without regard to how the rights are labeled or
+     categorized. For purposes of this Public License, the rights
+     specified in Section 2(b)(1)-(2) are not Copyright and Similar
+     Rights.
+
+  d. Effective Technological Measures means those measures that, in the
+     absence of proper authority, may not be circumvented under laws
+     fulfilling obligations under Article 11 of the WIPO Copyright
+     Treaty adopted on December 20, 1996, and/or similar international
+     agreements.
+
+  e. Exceptions and Limitations means fair use, fair dealing, and/or
+     any other exception or limitation to Copyright and Similar Rights
+     that applies to Your use of the Licensed Material.
+
+  f. Licensed Material means the artistic or literary work, database,
+     or other material to which the Licensor applied this Public
+     License.
+
+  g. Licensed Rights means the rights granted to You subject to the
+     terms and conditions of this Public License, which are limited to
+     all Copyright and Similar Rights that apply to Your use of the
+     Licensed Material and that the Licensor has authority to license.
+
+  h. Licensor means the individual(s) or entity(ies) granting rights
+     under this Public License.
+
+  i. Share means to provide material to the public by any means or
+     process that requires permission under the Licensed Rights, such
+     as reproduction, public display, public performance, distribution,
+     dissemination, communication, or importation, and to make material
+     available to the public including in ways that members of the
+     public may access the material from a place and at a time
+     individually chosen by them.
+
+  j. Sui Generis Database Rights means rights other than copyright
+     resulting from Directive 96/9/EC of the European Parliament and of
+     the Council of 11 March 1996 on the legal protection of databases,
+     as amended and/or succeeded, as well as other essentially
+     equivalent rights anywhere in the world.
+
+  k. You means the individual or entity exercising the Licensed Rights
+     under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+  a. License grant.
+
+       1. Subject to the terms and conditions of this Public License,
+          the Licensor hereby grants You a worldwide, royalty-free,
+          non-sublicensable, non-exclusive, irrevocable license to
+          exercise the Licensed Rights in the Licensed Material to:
+
+            a. reproduce and Share the Licensed Material, in whole or
+               in part; and
+
+            b. produce, reproduce, and Share Adapted Material.
+
+       2. Exceptions and Limitations. For the avoidance of doubt, where
+          Exceptions and Limitations apply to Your use, this Public
+          License does not apply, and You do not need to comply with
+          its terms and conditions.
+
+       3. Term. The term of this Public License is specified in Section
+          6(a).
+
+       4. Media and formats; technical modifications allowed. The
+          Licensor authorizes You to exercise the Licensed Rights in
+          all media and formats whether now known or hereafter created,
+          and to make technical modifications necessary to do so. The
+          Licensor waives and/or agrees not to assert any right or
+          authority to forbid You from making technical modifications
+          necessary to exercise the Licensed Rights, including
+          technical modifications necessary to circumvent Effective
+          Technological Measures. For purposes of this Public License,
+          simply making modifications authorized by this Section 2(a)
+          (4) never produces Adapted Material.
+
+       5. Downstream recipients.
+
+            a. Offer from the Licensor -- Licensed Material. Every
+               recipient of the Licensed Material automatically
+               receives an offer from the Licensor to exercise the
+               Licensed Rights under the terms and conditions of this
+               Public License.
+
+            b. No downstream restrictions. You may not offer or impose
+               any additional or different terms or conditions on, or
+               apply any Effective Technological Measures to, the
+               Licensed Material if doing so restricts exercise of the
+               Licensed Rights by any recipient of the Licensed
+               Material.
+
+       6. No endorsement. Nothing in this Public License constitutes or
+          may be construed as permission to assert or imply that You
+          are, or that Your use of the Licensed Material is, connected
+          with, or sponsored, endorsed, or granted official status by,
+          the Licensor or others designated to receive attribution as
+          provided in Section 3(a)(1)(A)(i).
+
+  b. Other rights.
+
+       1. Moral rights, such as the right of integrity, are not
+          licensed under this Public License, nor are publicity,
+          privacy, and/or other similar personality rights; however, to
+          the extent possible, the Licensor waives and/or agrees not to
+          assert any such rights held by the Licensor to the limited
+          extent necessary to allow You to exercise the Licensed
+          Rights, but not otherwise.
+
+       2. Patent and trademark rights are not licensed under this
+          Public License.
+
+       3. To the extent possible, the Licensor waives any right to
+          collect royalties from You for the exercise of the Licensed
+          Rights, whether directly or through a collecting society
+          under any voluntary or waivable statutory or compulsory
+          licensing scheme. In all other cases the Licensor expressly
+          reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+  a. Attribution.
+
+       1. If You Share the Licensed Material (including in modified
+          form), You must:
+
+            a. retain the following if it is supplied by the Licensor
+               with the Licensed Material:
+
+                 i. identification of the creator(s) of the Licensed
+                    Material and any others designated to receive
+                    attribution, in any reasonable manner requested by
+                    the Licensor (including by pseudonym if
+                    designated);
+
+                ii. a copyright notice;
+
+               iii. a notice that refers to this Public License;
+
+                iv. a notice that refers to the disclaimer of
+                    warranties;
+
+                 v. a URI or hyperlink to the Licensed Material to the
+                    extent reasonably practicable;
+
+            b. indicate if You modified the Licensed Material and
+               retain an indication of any previous modifications; and
+
+            c. indicate the Licensed Material is licensed under this
+               Public License, and include the text of, or the URI or
+               hyperlink to, this Public License.
+
+       2. You may satisfy the conditions in Section 3(a)(1) in any
+          reasonable manner based on the medium, means, and context in
+          which You Share the Licensed Material. For example, it may be
+          reasonable to satisfy the conditions by providing a URI or
+          hyperlink to a resource that includes the required
+          information.
+
+       3. If requested by the Licensor, You must remove any of the
+          information required by Section 3(a)(1)(A) to the extent
+          reasonably practicable.
+
+       4. If You Share Adapted Material You produce, the Adapter's
+          License You apply must not prevent recipients of the Adapted
+          Material from complying with this Public License.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+     to extract, reuse, reproduce, and Share all or a substantial
+     portion of the contents of the database;
+
+  b. if You include all or a substantial portion of the database
+     contents in a database in which You have Sui Generis Database
+     Rights, then the database in which You have Sui Generis Database
+     Rights (but not its individual contents) is Adapted Material; and
+
+  c. You must comply with the conditions in Section 3(a) if You Share
+     all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+  c. The disclaimer of warranties and limitation of liability provided
+     above shall be interpreted in a manner that, to the extent
+     possible, most closely approximates an absolute disclaimer and
+     waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+  a. This Public License applies for the term of the Copyright and
+     Similar Rights licensed here. However, if You fail to comply with
+     this Public License, then Your rights under this Public License
+     terminate automatically.
+
+  b. Where Your right to use the Licensed Material has terminated under
+     Section 6(a), it reinstates:
+
+       1. automatically as of the date the violation is cured, provided
+          it is cured within 30 days of Your discovery of the
+          violation; or
+
+       2. upon express reinstatement by the Licensor.
+
+     For the avoidance of doubt, this Section 6(b) does not affect any
+     right the Licensor may have to seek remedies for Your violations
+     of this Public License.
+
+  c. For the avoidance of doubt, the Licensor may also offer the
+     Licensed Material under separate terms or conditions or stop
+     distributing the Licensed Material at any time; however, doing so
+     will not terminate this Public License.
+
+  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+     License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+  a. The Licensor shall not be bound by any additional or different
+     terms or conditions communicated by You unless expressly agreed.
+
+  b. Any arrangements, understandings, or agreements regarding the
+     Licensed Material not stated herein are separate from and
+     independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+  a. For the avoidance of doubt, this Public License does not, and
+     shall not be interpreted to, reduce, limit, restrict, or impose
+     conditions on any use of the Licensed Material that could lawfully
+     be made without permission under this Public License.
+
+  b. To the extent possible, if any provision of this Public License is
+     deemed unenforceable, it shall be automatically reformed to the
+     minimum extent necessary to make it enforceable. If the provision
+     cannot be reformed, it shall be severed from this Public License
+     without affecting the enforceability of the remaining terms and
+     conditions.
+
+  c. No term or condition of this Public License will be waived and no
+     failure to comply consented to unless expressly agreed to by the
+     Licensor.
+
+  d. Nothing in this Public License constitutes or may be interpreted
+     as a limitation upon, or waiver of, any privileges and immunities
+     that apply to the Licensor or You, including from the legal
+     processes of any jurisdiction or authority.
+
+
+=======================================================================
+
+Creative Commons is not a party to its public
+licenses. Notwithstanding, Creative Commons may elect to apply one of
+its public licenses to material it publishes and in those instances
+will be considered the “Licensor.” The text of the Creative Commons
+public licenses is dedicated to the public domain under the CC0 Public
+Domain Dedication. Except for the limited purpose of indicating that
+material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the
+public licenses.
+
+Creative Commons may be contacted at creativecommons.org.
@@ -3,7 +3,11 @@
 <a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons Licence" style="border-width:0" src="http://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br /><span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Blood Arsenal</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="https://github.com/Arcaratus/BloodArsenal" property="cc:attributionName" rel="cc:attributionURL">Arcaratus</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.


-# Fork
+## Fork
 This mod was forked by the GT:NH Team to continue the development of the 1.7.10 Branch.
 The up-to-date Master branch can be found on our Jenkins:
 http://jenkins.usrv.de
+
+## License
+
+This work is licensed under the Creative Commons Attribution 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by/4.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
@@ -1,158 +1,721 @@
+//version: 1643844119
+/*
+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/GTNewHorizons/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 {
    repositories {
-        mavenCentral()
        maven {
-            name = "GT"
-            url = "https://gregtech.overminddl1.com/"
+            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/"
+        }
        maven {
            name = "jitpack"
            url = "https://jitpack.io"
        }
-        maven {
-            url = "https://plugins.gradle.org/m2/"
-        }
    }
    dependencies {
-        classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.4'
-        classpath 'org.ajoberstar:gradle-git:0.10.1'
-        classpath "de.undercouch:gradle-download-task:3.1.2"
+        classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.7'
    }
 }

-import de.undercouch.gradle.tasks.download.Download
+plugins {
+    id 'idea'
+    id 'eclipse'
+    id 'scala'
+    id('org.jetbrains.kotlin.jvm') version ('1.6.10') apply false
+    id('org.ajoberstar.grgit') version('4.1.1')
+    id('com.github.johnrengelman.shadow') version('4.0.4')
+    id('com.palantir.git-version') version('0.13.0') apply false
+    id('de.undercouch.download') version('5.0.1')
+    id('maven-publish')
+}
+
+if (project.file('.git/HEAD').isFile()) {
+    apply plugin: 'com.palantir.git-version'
+}

 apply plugin: 'forge'
-apply plugin: 'signing'

-ext.configFile = file "build.properties"
-configFile.withReader {
-    def prop = new Properties()
-    prop.load(it)
-    project.ext.config = new ConfigSlurper().parse prop
+def projectJavaVersion = JavaLanguageVersion.of(8)
+
+java {
+    toolchain {
+        languageVersion.set(projectJavaVersion)
+    }
 }

-version = config.mc_version + "-" + config.mod_version + "-" + config.build_number
-group= config.package_group
-archivesBaseName = config.mod_name
-
-import org.ajoberstar.grgit.Grgit
-
-def gitHash = 'unknown'
-if (new File(projectDir, '.git').exists()) {
-    def repo = Grgit.open(project.file('.'))
-    gitHash = repo.log().find().abbreviatedId
+idea {
+    module {
+        inheritOutputDirs = true
+        downloadJavadoc = true
+        downloadSources = true
+    }
 }

-repositories {
-    maven { //Tinker's and Mantle
-        name 'DVS1 Maven FS'
-        url 'https://dvs1.progwml6.com/files/maven'
+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")
+
+boolean noPublishedSources = project.findProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false
+
+String javaSourceDir = "src/main/java/"
+String scalaSourceDir = "src/main/scala/"
+String kotlinSourceDir = "src/main/kotlin/"
+
+String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/")
+String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/")
+String targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/")
+if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
+    throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
+}
+
+if(apiPackage) {
+    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
+    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
+    targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
+    if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
+        throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
    }
-    maven {
-        name = "gt"
-        url = "https://gregtech.overminddl1.com/"
+}
+
+if(accessTransformersFile) {
+    String targetFile = "src/main/resources/META-INF/" + accessTransformersFile
+    if(!getFile(targetFile).exists()) {
+        throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
    }
-    ivy {
-        name = "gtnh_download_source"
-        artifactPattern("http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]-[revision].[ext]")
+}
+
+if(usesMixins.toBoolean()) {
+    if(mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) {
+        throw new GradleException("\"mixinPlugin\" requires \"mixinsPackage\" and \"mixinPlugin\" to be set!")
    }
-    maven {
-        name = "jitpack"
-        url = "https://jitpack.io"
+
+    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
+    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
+    targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
+    if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
+        throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala  + " or " + targetPackageKotlin)
    }
+
+    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"
+    String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".kt"
+    if(!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) {
+        throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin)
+    }
+}
+
+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"
+    String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".kt"
+    if(!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) {
+        throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin)
+    }
+}
+
+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
+try {
+    'git config core.fileMode false'.execute()
+}
+catch (Exception e) {
+    logger.error("\u001B[31mgit isn't installed at all\u001B[0m")
+}
+
+// Pulls version first from the VERSION env and then git tag
+String identifiedVersion
+String versionOverride = System.getenv("VERSION") ?: null
+try {
+    identifiedVersion = versionOverride == null ? gitVersion() : versionOverride
+}
+catch (Exception e) {
+    logger.error("\n\u001B[1;31mThis mod must be version controlled by Git AND the repository must provide at least one tag,\n" +
+                 "or the VERSION override must be set! \u001B[32m(Don't download from GitHub using the ZIP option, instead\n" +
+                 "clone the repository, see\u001B[33m https://gtnh.miraheze.org/wiki/Development \u001B[32mfor details.)\u001B[0m\n");
+    versionOverride = 'NO-GIT-TAG-SET'
+    identifiedVersion = versionOverride
+}
+version = minecraftVersion + '-' + identifiedVersion
+String modVersion = version
+
+if( identifiedVersion.equals(versionOverride) ) {
+    logger.error('\u001B[31m\u001B[7mWe hope you know what you\'re doing using\u001B[0m\u001B[1;34m ' + modVersion + '\u001B[0m\n');
+    logger.error('\7\u001B[31mGoing to blindly try to use\u001B[1;34m ' + modVersion + '\u001B[0m\u001B[31m, this probably won\'t work the way you expect!!\u001B[0m\n');
+}
+
+group = modGroup
+if(project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
+    archivesBaseName = customArchiveBaseName
+}
+else {
+    archivesBaseName = modId
+}
+
+
+def arguments = []
+def jvmArguments = []
+
+if(usesMixins.toBoolean()) {
+    arguments += [
+            "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
+    ]
+    jvmArguments += [
+            "-Dmixin.debug.countInjections=true", "-Dmixin.debug.verbose=true", "-Dmixin.debug.export=true"
+    ]
 }

 minecraft {
-    version = "1.7.10-10.13.4.1614-1.7.10"
-    runDir = "eclipse"
-	
-    replaceIn "BloodArsenal.java"
-    replace "@VERSION@", config.mod_version + "-" + config.build_number
+    version = minecraftVersion + "-" + forgeVersion + "-" + minecraftVersion
+    runDir = "run"
+
+    if (replaceGradleTokenInFile) {
+        replaceIn replaceGradleTokenInFile
+        if(gradleTokenModId) {
+            replace gradleTokenModId, modId
+        }
+        if(gradleTokenModName) {
+            replace gradleTokenModName, modName
+        }
+        if(gradleTokenVersion) {
+            replace gradleTokenVersion, modVersion
+        }
+        if(gradleTokenGroupName) {
+            replace gradleTokenGroupName, modGroup
+        }
+    }
+
+    clientIntellijRun {
+        args(arguments)
+        jvmArgs(jvmArguments)
+
+        if(developmentEnvironmentUserName) {
+            args("--username", developmentEnvironmentUserName)
+        }
+    }
+
+    serverIntellijRun {
+        args(arguments)
+        jvmArgs(jvmArguments)
+    }
+}
+
+if(file("addon.gradle").exists()) {
+    apply from: "addon.gradle"
+}
+
+apply from: 'repositories.gradle'
+
+configurations {
+    implementation.extendsFrom(shadowImplementation)  // TODO: remove after all uses are refactored
+    implementation.extendsFrom(shadowCompile)
+    implementation.extendsFrom(shadeCompile)
+}
+
+repositories {
+    maven {
+        name = "Overmind forge repo mirror"
+        url = "https://gregtech.overminddl1.com/"
+    }
+    if(usesMixins.toBoolean()) {
+        maven {
+            name = "sponge"
+            url = "https://repo.spongepowered.org/repository/maven-public"
+        }
+        maven {
+            url = "https://jitpack.io"
+        }
+    }
 }

 dependencies {
-    compile "com.github.GTNewHorizons:NotEnoughItems:master-SNAPSHOT:dev"
-    compile "com.github.GTNewHorizons:ForgeMultipart:master-SNAPSHOT:dev"
-    compile "com.github.GTNewHorizons:waila:master-SNAPSHOT:dev"
-    compile("com.github.GTNewHorizons:TinkersConstruct:master-SNAPSHOT:dev") {
-        transitive = false
+    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("com.github.GTNewHorizons:SpongePoweredMixin:0.7.12-GTNH") {
+            // 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.5.0")
    }
-    compile "mantle:Mantle:1.7.10-0.3.2.jenkins187:deobf"
-    compile "info.amerifrance.guideapi:Guide-API:" + config.mc_version + "-" + config.guideapi_version + ":deobf"
-    compile "com.azanor.baubles:Baubles:1.7.10-" + config.baubles_version + ":deobf"
-    compile fileTree(dir: 'libs', include: '*.jar')
+}
+
+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()) {
+        getFile("/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"
+}
+
+"""
+    }
+}
+
+task relocateShadowJar(type: ConfigureShadowRelocation) {
+    target = tasks.shadowJar
+    prefix = modGroup + ".shadow"
+}
+
+shadowJar {
+    project.configurations.shadeCompile.each { dep ->
+        from(project.zipTree(dep)) {
+            exclude 'META-INF', 'META-INF/**'
+        }
+    }
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    minimize()  // This will only allow shading for actually used classes
+    configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
+    dependsOn(relocateShadowJar)
+}
+
+jar {
+    project.configurations.shadeCompile.each { dep ->
+        from(project.zipTree(dep)) {
+            exclude 'META-INF', 'META-INF/**'
+        }
+    }
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    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 {
+    if(developmentEnvironmentUserName) {
+        arguments += [
+                "--username",
+                developmentEnvironmentUserName
+        ]
+    }
+
+    args(arguments)
+    jvmArgs(jvmArguments)
+}
+
+runServer {
+    args(arguments)
+    jvmArgs(jvmArguments)
+}
+
+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 '**/*.info'
-        include '**/*.properties'
+        include 'mcmod.info'

-        expand 'version': project.version, 'mcversion': project.minecraft.version
+        // replace version and mcversion
+        expand "minecraftVersion": project.minecraft.version,
+            "modVersion": modVersion,
+            "modId": modId,
+            "modName": modName
    }
+
+    if(usesMixins.toBoolean()) {
+        from refMap
+    }
+
+    // copy everything else, thats not the mcmod.info
    from(sourceSets.main.resources.srcDirs) {
-        exclude '**/*.info'
-        exclude '**/*.properties'
-        exclude '**/*.db'
-    } 
-}
-
-task getThaumcraft(type: Download) {
-    onlyIf {
-        !file("libs/Thaumcraft-deobf-1.7.10-4.2.3.5.jar").exists()
+        exclude 'mcmod.info'
    }
-    src 'http://downloads.gtnewhorizons.com/Mods_for_Jenkins/Thaumcraft-1.7.10-4.2.3.5-deobf.jar'
-    dest file("libs/Thaumcraft-deobf-1.7.10-4.2.3.5.jar")
-    mustRunAfter "deobfBinJar"
-    mustRunAfter "repackMinecraft"
 }

-task getBloodMagic(type: Download, dependsOn: "getThaumcraft") {
-    onlyIf {
-        !file("libs/BloodMagic-1.7.10-1.3.3-17-deobf.jar").exists()
+def getManifestAttributes() {
+    def manifestAttributes = [:]
+    if(containsMixinsAndOrCoreModOnly.toBoolean() == false && (usesMixins.toBoolean() || coreModClass)) {
+        manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
    }
-    src 'http://downloads.gtnewhorizons.com/Mods_for_Jenkins/BloodMagic-1.7.10-1.3.3-17-deobf.jar'
-    dest file("libs/BloodMagic-1.7.10-1.3.3-17-deobf.jar")
-    mustRunAfter "deobfBinJar"
-    mustRunAfter "repackMinecraft"
+
+    if(accessTransformersFile) {
+        manifestAttributes += ["FMLAT" : accessTransformersFile.toString()]
+    }
+
+    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
 }

-tasks.setupCIWorkspace.dependsOn getBloodMagic
-tasks.setupDevWorkspace.dependsOn getBloodMagic
-tasks.setupDecompWorkspace.dependsOn getBloodMagic
-tasks.compileJava.dependsOn getBloodMagic
-
-task deobfJar(type: Jar) {
-    from(sourceSets.main.output)
-    classifier = 'deobf'     
-
-    tasks.build.dependsOn deobfJar
-
-    tasks.withType(JavaCompile) { task ->
-        task.options.encoding = 'UTF-8'
-    }    
+task sourcesJar(type: Jar) {
+    from (sourceSets.main.allJava)
+    from (file("$projectDir/LICENSE"))
+    getArchiveClassifier().set('sources')
 }

-task signJar(dependsOn: 'reobf'){
+task shadowDevJar(type: ShadowJar) {
+    project.configurations.shadeCompile.each { dep ->
+        from(project.zipTree(dep)) {
+            exclude 'META-INF', 'META-INF/**'
+        }
+    }
+
+    from sourceSets.main.output
+    getArchiveClassifier().set("dev")
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    minimize()  // This will only allow shading for actually used classes
+    configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
+}
+
+task relocateShadowDevJar(type: ConfigureShadowRelocation) {
+    target = tasks.shadowDevJar
+    prefix = modGroup + ".shadow"
+}
+
+task circularResolverJar(type: Jar) {
+    dependsOn(relocateShadowDevJar)
+    dependsOn(shadowDevJar)
+    enabled = false
+}
+
+task devJar(type: Jar) {
+    project.configurations.shadeCompile.each { dep ->
+        from(project.zipTree(dep)) {
+            exclude 'META-INF', 'META-INF/**'
+        }
+    }
+
+    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().replaceAll("\\.", "/") + '/**'
+    }
+
+    from (sourceSets.main.output) {
+        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
+    }
+
+    from (sourceSets.main.resources.srcDirs) {
+        include("LICENSE")
+    }
+
+    getArchiveClassifier().set('api')
+}
+
+artifacts {
+    if(!noPublishedSources) {
+        archives sourcesJar
+    }
+    archives devJar
+    if(apiPackage) {
+        archives apiJar
+    }
+}
+
+// The gradle metadata includes all of the additional deps that we disabled from POM generation (including forgeBin with no groupID), 
+// and isn't strictly needed with the POM so just disable it.
+tasks.withType(GenerateModuleMetadata) {
+    enabled = false
+}
+
+
+// publishing
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from components.java
+            if(usesShadowedDependencies.toBoolean()) {
+                artifact source: shadowJar, classifier: ""
+            }
+            if(!noPublishedSources) {
+                artifact source: sourcesJar, classifier: "src"
+            }
+            artifact source: usesShadowedDependencies.toBoolean() ? shadowDevJar : devJar, classifier: "dev"
+            if (apiPackage) {
+                artifact source: apiJar, classifier: "api"
+            }
+
+            groupId = System.getenv("ARTIFACT_GROUP_ID") ?: "com.github.GTNewHorizons"
+            artifactId = System.getenv("ARTIFACT_ID") ?: project.name
+            // Using the identified version, not project.version as it has the prepended 1.7.10
+            version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
+            
+            // Remove all non GTNH deps here.
+            // Original intention was to remove an invalid forgeBin being generated without a groupId (mandatory), but
+            // it also removes all of the MC deps
+            pom.withXml {
+                Node pomNode = asNode()
+                pomNode.dependencies.'*'.findAll() {
+                    it.groupId.text() != 'com.github.GTNewHorizons'
+                }.each() {
+                    it.parent().remove(it)
+                }
+            }
+        }
+    }
+
+    repositories {
+        maven {
+            url = "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases"
+            credentials {
+                username = System.getenv("MAVEN_USER") ?: "NONE"
+                password = System.getenv("MAVEN_PASSWORD") ?: "NONE"
+            }
+        }
+    }
+}
+
+// Updating
+task updateBuildScript {
    doLast {
-        ant.signjar(
-            destDir: jar.destinationDir,
-            jar: jar.getArchivePath(),
-            alias: findProperty('keyStoreAlias') ?: '',
-            keystore: findProperty('keyStore') ?: '',
-            storepass: findProperty('keyStorePass') ?: '',
-            digestalg: findProperty('signDigestAlg') ?: '',
-            tsaurl: findProperty('signTSAurl') ?: '',
-            verbose: true
-            )
+        if (performBuildScriptUpdate(projectDir.toString())) return
+
+        print("Build script already up-to-date!")
    }
 }
+
+if (isNewBuildScriptVersionAvailable(projectDir.toString())) {
+    if (autoUpdateBuildScript.toBoolean()) {
+        performBuildScriptUpdate(projectDir.toString())
+    } else {
+        println("Build script update available! Run 'gradle updateBuildScript'")
+    }
+}
+
+static URL availableBuildScriptUrl() {
+    new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/main/build.gradle")
+}
+
+boolean performBuildScriptUpdate(String projectDir) {
+    if (isNewBuildScriptVersionAvailable(projectDir)) {
+        def buildscriptFile = getFile("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
+}
+
+boolean isNewBuildScriptVersionAvailable(String projectDir) {
+    Map parameters = ["connectTimeout": 2000, "readTimeout": 2000]
+
+    String currentBuildScript = getFile("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'
+}
+
+// Deobfuscation
+
+def deobf(String sourceURL) {
+    try {
+        URL url = new URL(sourceURL)
+        String fileName = url.getFile()
+
+        //get rid of directories:
+        int lastSlash = fileName.lastIndexOf("/")
+        if(lastSlash > 0) {
+            fileName = fileName.substring(lastSlash + 1)
+        }
+        //get rid of extension:
+        if(fileName.endsWith(".jar")) {
+            fileName = fileName.substring(0, fileName.lastIndexOf("."))
+        }
+
+        String hostName = url.getHost()
+        if(hostName.startsWith("www.")) {
+            hostName = hostName.substring(4)
+        }
+        List parts = Arrays.asList(hostName.split("\\."))
+        Collections.reverse(parts)
+        hostName = String.join(".", parts)
+
+        return deobf(sourceURL, hostName + "/" + fileName)
+    } catch(Exception e) {
+        return deobf(sourceURL, "deobf/" + String.valueOf(sourceURL.hashCode()))
+    }
+}
+
+// The method above is to be prefered. Use this method if the filename is not at the end of the URL.
+def deobf(String sourceURL, String fileName) {
+    String cacheDir = System.getProperty("user.home") + "/.gradle/caches/"
+    String bon2Dir = cacheDir + "forge_gradle/deobf"
+    String bon2File  = bon2Dir + "/BON2-2.5.0.jar"
+    String obfFile = cacheDir + "modules-2/files-2.1/" + fileName + ".jar"
+    String deobfFile = cacheDir + "modules-2/files-2.1/" + fileName + "-deobf.jar"
+    
+    if(file(deobfFile).exists()) {
+        return files(deobfFile)
+    }
+
+    download {
+        src 'https://github.com/GTNewHorizons/BON2/releases/download/2.5.0/BON2-2.5.0.CUSTOM-all.jar'
+        dest bon2File
+        quiet true
+        overwrite false
+    }
+
+    download {
+        src sourceURL
+        dest obfFile
+        quiet true
+        overwrite false
+    }
+
+    exec {
+        commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', '1.7.10', '--mappingsVer', 'stable_12', '--notch'
+        workingDir bon2Dir
+        standardOutput = new ByteArrayOutputStream()
+    }
+
+    return files(deobfFile)
+}
+
+// Helper methods
+
+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/GTNewHorizons/ExampleMod1.7.10/blob/main/gradle.properties")
+    }
+}
+
+def getFile(String relativePath) {
+    return new File(projectDir, relativePath)
+}
@@ -1,17 +0,0 @@
-mod_name=BloodArsenal
-package_group=com.arc.bloodarsenal
-
-mod_version=1.2.3
-mc_version=1.7.10
-
-ccLib_version=1.1.3.138
-ccc_version=1.0.7.46
-nei_version=1.0.5.111
-tconstruct_version=1.8.5.build959
-forgeMultipart_version=1.2.0.347
-waila_version=1.5.11-RC2-NONEI
-guideapi_version=1.0.1-20
-baubles_version=1.0.1.10
-
-forge_version=10.13.4.1614
-build_number=11
@@ -0,0 +1,15 @@
+// Add your dependencies here
+
+dependencies {
+    compile 'com.github.GTNewHorizons:NotEnoughItems:2.2.5-GTNH:dev'
+    compile 'com.github.GTNewHorizons:ForgeMultipart:1.2.7:dev'
+    compile 'com.github.GTNewHorizons:waila:1.5.18:dev'
+    compile 'com.github.GTNewHorizons:Baubles:1.0.1.14:dev'
+    compile 'com.github.GTNewHorizons:Mantle:0.3.4:dev'
+    compile 'com.github.GTNewHorizons:BloodMagic:1.3.5:dev'
+    compile('com.github.GTNewHorizons:TinkersConstruct:1.9.0.13-GTNH:dev') {
+        transitive = false
+    }
+    compile 'com.github.GTNewHorizons:Guide-API:1.0.2:dev'
+    compile 'thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev'
+}
@@ -0,0 +1,67 @@
+modName = Blood Arsenal
+
+# This is a case-sensitive string to identify your mod. Convention is to use lower case.
+modId = BloodArsenal
+
+modGroup = com.arc.bloodarsenal
+
+# 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 username 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 mod's 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 = BloodArsenal.java
+gradleTokenModId = GRADLETOKEN_MODID
+gradleTokenModName = GRADLETOKEN_MODNAME
+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. It 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 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 compatibility 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 'shadowCompile' 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
+
+# Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older
+# projects. New projects should not use this parameter.
+#customArchiveBaseName =
+
+# Optional parameter to prevent the source code from being published
+# noPublishedSources = 
@@ -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-4.4.1-all.zip
@@ -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" "$@"
@@ -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
@@ -0,0 +1,2 @@
+before_install:
+  - ./gradlew setupCIWorkspace
@@ -0,0 +1,21 @@
+// Add any additional repositories for your dependencies here
+
+repositories {
+    mavenCentral ()
+    maven {
+        name = "GTNH Maven"
+        url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
+    }
+    maven {
+        name = "ic2"
+        url = "https://maven.ic2.player.to/"
+        metadataSources {
+            mavenPom()
+            artifact()
+        }
+    }
+    maven {
+        name = "jitpack"
+        url = "https://jitpack.io"
+    }
+}
@@ -1,7 +0,0 @@
-package baubles.api;
-
-public enum BaubleType {
-	RING,
-	AMULET,
-	BELT
-}
@@ -1,41 +0,0 @@
-package baubles.api;
-
-import java.lang.reflect.Method;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.IInventory;
-import cpw.mods.fml.common.FMLLog;
-
-/**
- * @author Azanor
- */
-public class BaublesApi 
-{
-	static Method getBaubles;
-	
-	/**
-	 * Retrieves the baubles inventory for the supplied player
-	 */
-	public static IInventory getBaubles(EntityPlayer player)
-	{
-		IInventory ot = null;
-		
-	    try
-	    {
-	        if(getBaubles == null) 
-	        {
-	            Class<?> fake = Class.forName("baubles.common.lib.PlayerHandler");
-	            getBaubles = fake.getMethod("getPlayerBaubles", EntityPlayer.class);
-	        }
-	        
-	        ot = (IInventory) getBaubles.invoke(null, player);
-	    } 
-	    catch(Exception ex) 
-	    { 
-	    	FMLLog.warning("[Baubles API] Could not invoke baubles.common.lib.PlayerHandler method getPlayerBaubles");
-	    }
-	    
-		return ot;
-	}
-	
-}
@@ -1,45 +0,0 @@
-package baubles.api;
-
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.item.ItemStack;
-
-/**
- * 
- * This interface should be extended by items that can be worn in bauble slots
- * 
- * @author Azanor
- */
-
-public interface IBauble {
-	
-	/**
-	 * This method return the type of bauble this is. 
-	 * Type is used to determine the slots it can go into.
-	 */
-	public BaubleType getBaubleType(ItemStack itemstack);
-	
-	/**
-	 * This method is called once per tick if the bauble is being worn by a player
-	 */
-	public void onWornTick(ItemStack itemstack, EntityLivingBase player);
-	
-	/**
-	 * This method is called when the bauble is equipped by a player
-	 */
-	public void onEquipped(ItemStack itemstack, EntityLivingBase player);
-	
-	/**
-	 * This method is called when the bauble is unequipped by a player
-	 */
-	public void onUnequipped(ItemStack itemstack, EntityLivingBase player);
-
-	/**
-	 * can this bauble be placed in a bauble slot
-	 */
-	public boolean canEquip(ItemStack itemstack, EntityLivingBase player);
-	
-	/**
-	 * Can this bauble be removed from a bauble slot
-	 */
-	public boolean canUnequip(ItemStack itemstack, EntityLivingBase player);
-}
@@ -1,5 +0,0 @@
-@API(owner = "Baubles", apiVersion = baubles.common.Baubles.VERSION, provides = "Baubles|API")
-package baubles.api;
-
-import cpw.mods.fml.common.API;
-
@@ -1,52 +0,0 @@
-package cofh.api.energy;
-
-import net.minecraft.item.ItemStack;
-
-/**
- * Implement this interface on Item classes that support external manipulation of their internal energy storages.
- * 
- * A reference implementation is provided {@link ItemEnergyContainer}.
- * 
- * @author King Lemming
- * 
- */
-public interface IEnergyContainerItem
-{
-
-    /**
-     * Adds energy to an prefix. Returns the quantity of energy that was accepted. This should always return 0 if the prefix cannot be externally charged.
-     * 
-     * @param container
-     *            ItemStack to be charged.
-     * @param maxReceive
-     *            Maximum amount of energy to be sent into the prefix.
-     * @param simulate
-     *            If TRUE, the charge will only be simulated.
-     * @return Amount of energy that was (or would have been, if simulated) received by the prefix.
-     */
-    int receiveEnergy (ItemStack container, int maxReceive, boolean simulate);
-
-    /**
-     * Removes energy from an prefix. Returns the quantity of energy that was removed. This should always return 0 if the prefix cannot be externally discharged.
-     * 
-     * @param container
-     *            ItemStack to be discharged.
-     * @param maxExtract
-     *            Maximum amount of energy to be extracted from the prefix.
-     * @param simulate
-     *            If TRUE, the discharge will only be simulated.
-     * @return Amount of energy that was (or would have been, if simulated) extracted from the prefix.
-     */
-    int extractEnergy (ItemStack container, int maxExtract, boolean simulate);
-
-    /**
-     * Get the amount of energy currently stored in the prefix.
-     */
-    int getEnergyStored (ItemStack container);
-
-    /**
-     * Get the max amount of energy that can be stored in the prefix.
-     */
-    int getMaxEnergyStored (ItemStack container);
-
-}
@@ -1,9 +0,0 @@
-package cofh.core.item;
-
-import net.minecraft.item.ItemStack;
-
-public interface IEqualityOverrideItem {
-
-	public boolean isLastHeldItemEqual(ItemStack current, ItemStack previous);
-
-}
@@ -1,22 +0,0 @@
-package thaumcraft.api;
-
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.item.ItemStack;
-
-/**
- * 
- * @author Azanor
- * 
- * Equipped head slot items that extend this class will be able to perform most functions that 
- * goggles of revealing can apart from view nodes which is handled by IRevealer.
- *
- */
-
-public interface IGoggles {
-	
-	/*
-	 * If this method returns true things like block essentia contents will be shown.
-	 */
-	public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player);
-
-}
@@ -1,70 +0,0 @@
-package thaumcraft.api;
-
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import cpw.mods.fml.common.FMLLog;
-
-/**
- * @author Azanor	
- * 
- * This is used to gain access to the items in my mod. 
- * I only give some examples and it will probably still 
- * require a bit of work for you to get hold of everything you need.
- *
- */
-public class ItemApi {
-	
-	public static ItemStack getItem(String itemString, int meta) {
-		ItemStack item = null;
-
-		try {
-			String itemClass = "thaumcraft.common.config.ConfigItems";
-			Object obj = Class.forName(itemClass).getField(itemString).get(null);
-			if (obj instanceof Item) {
-				item = new ItemStack((Item) obj,1,meta);
-			} else if (obj instanceof ItemStack) {
-				item = (ItemStack) obj;
-			}
-		} catch (Exception ex) {
-			FMLLog.warning("[Thaumcraft] Could not retrieve item identified by: " + itemString);
-		}
-
-		return item;
-	}
-	
-	public static ItemStack getBlock(String itemString, int meta) {
-		ItemStack item = null;
-
-		try {
-			String itemClass = "thaumcraft.common.config.ConfigBlocks";
-			Object obj = Class.forName(itemClass).getField(itemString).get(null);
-			if (obj instanceof Block) {
-				item = new ItemStack((Block) obj,1,meta);
-			} else if (obj instanceof ItemStack) {
-				item = (ItemStack) obj;
-			}
-		} catch (Exception ex) {
-			FMLLog.warning("[Thaumcraft] Could not retrieve block identified by: " + itemString);
-		}
-
-		return item;
-	}
-
-	/** 
-	 * 
-	 * Some examples
-	 * 
-	 * Casting Wands:
-	 * itemWandCasting
-	 *  
-	 * Resources:
-	 * itemEssence, itemWispEssence, itemResource, itemShard, itemNugget, 
-	 * itemNuggetChicken, itemNuggetBeef, itemNuggetPork, itemTripleMeatTreat
-	 * 
-	 * Research:
-	 * itemResearchNotes, itemInkwell, itemThaumonomicon
-	 * 
-	 */
-
-}
@@ -1,588 +0,0 @@
-package thaumcraft.api;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-
-import net.minecraft.block.Block;
-import net.minecraft.enchantment.Enchantment;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.Item.ToolMaterial;
-import net.minecraft.item.ItemArmor.ArmorMaterial;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.EnumHelper;
-import net.minecraftforge.oredict.OreDictionary;
-import thaumcraft.api.aspects.Aspect;
-import thaumcraft.api.aspects.AspectList;
-import thaumcraft.api.crafting.CrucibleRecipe;
-import thaumcraft.api.crafting.InfusionEnchantmentRecipe;
-import thaumcraft.api.crafting.InfusionRecipe;
-import thaumcraft.api.crafting.ShapedArcaneRecipe;
-import thaumcraft.api.crafting.ShapelessArcaneRecipe;
-import thaumcraft.api.internal.DummyInternalMethodHandler;
-import thaumcraft.api.internal.IInternalMethodHandler;
-import thaumcraft.api.internal.WeightedRandomLoot;
-import thaumcraft.api.research.IScanEventHandler;
-import thaumcraft.api.research.ResearchCategories;
-import thaumcraft.api.research.ResearchCategoryList;
-import thaumcraft.api.research.ResearchItem;
-import thaumcraft.api.research.ResearchPage;
-
-
-/**
- * @author Azanor
- *
- *
- * IMPORTANT: If you are adding your own aspects to items it is a good idea to do it AFTER Thaumcraft adds its aspects, otherwise odd things may happen.
- *
- */
-public class ThaumcraftApi {
-	
-	//Materials	
-	public static ToolMaterial toolMatThaumium = EnumHelper.addToolMaterial("THAUMIUM", 3, 400, 7F, 2, 22);
-	public static ToolMaterial toolMatVoid = EnumHelper.addToolMaterial("VOID", 4, 150, 8F, 3, 10);
-	public static ToolMaterial toolMatElemental = EnumHelper.addToolMaterial("THAUMIUM_ELEMENTAL", 3, 1500, 10F, 3, 18);
-	public static ArmorMaterial armorMatThaumium = EnumHelper.addArmorMaterial("THAUMIUM", 25, new int[] { 2, 6, 5, 2 }, 25);
-	public static ArmorMaterial armorMatSpecial = EnumHelper.addArmorMaterial("SPECIAL", 25, new int[] { 1, 3, 2, 1 }, 25);
-	public static ArmorMaterial armorMatThaumiumFortress = EnumHelper.addArmorMaterial("FORTRESS", 40, new int[] { 3, 7, 6, 3 }, 25);
-	public static ArmorMaterial armorMatVoid = EnumHelper.addArmorMaterial("VOID", 10, new int[] { 3, 7, 6, 3 }, 10);
-	public static ArmorMaterial armorMatVoidFortress = EnumHelper.addArmorMaterial("VOIDFORTRESS", 18, new int[] { 4, 8, 7, 4 }, 10);
-	
-	//Enchantment references
-	public static int enchantFrugal;
-	public static int enchantPotency;
-	public static int enchantWandFortune;
-	public static int enchantHaste;
-	public static int enchantRepair;
-	
-	//Miscellaneous
-	/**
-	 * Portable Hole Block-id Blacklist. 
-	 * Simply add the block-id's of blocks you don't want the portable hole to go through.
-	 */
-	public static ArrayList<Block> portableHoleBlackList = new ArrayList<Block>();
-	
-	//Internal (Do not alter this unless you like pretty explosions)
-	//Calling methods from this will only work properly once Thaumcraft is past the FMLPreInitializationEvent phase.
-	public static IInternalMethodHandler internalMethods = new DummyInternalMethodHandler();	
-	
-	//RESEARCH/////////////////////////////////////////
-	public static ArrayList<IScanEventHandler> scanEventhandlers = new ArrayList<IScanEventHandler>();
-	public static ArrayList<EntityTags> scanEntities = new ArrayList<EntityTags>();
-	public static class EntityTagsNBT {
-		public EntityTagsNBT(String name, Object value) {
-			this.name = name;
-			this.value = value;
-		}
-		public String name;
-		public Object value;
-	}
-	public static class EntityTags {
-		public EntityTags(String entityName, AspectList aspects, EntityTagsNBT... nbts) {
-			this.entityName = entityName;
-			this.nbts = nbts;
-			this.aspects = aspects;
-		}
-		public String entityName;
-		public EntityTagsNBT[] nbts;
-		public AspectList aspects;
-	}
-	
-	/**
-	 * not really working atm, so ignore it for now
-	 * @param scanEventHandler
-	 */
-	public static void registerScanEventhandler(IScanEventHandler scanEventHandler) {
-		scanEventhandlers.add(scanEventHandler);
-	}
-	
-	/**
-	 * This is used to add aspects to entities which you can then scan using a thaumometer.
-	 * Also used to calculate vis drops from mobs.
-	 * @param entityName
-	 * @param aspects
-	 * @param nbt you can specify certain nbt keys and their values 
-	 * 			  to differentiate between mobs. <br>For example the normal and wither skeleton:
-	 * 	<br>ThaumcraftApi.registerEntityTag("Skeleton", (new AspectList()).add(Aspect.DEATH, 5));
-	 * 	<br>ThaumcraftApi.registerEntityTag("Skeleton", (new AspectList()).add(Aspect.DEATH, 8), new NBTTagByte("SkeletonType",(byte) 1));
-	 */
-	public static void registerEntityTag(String entityName, AspectList aspects, EntityTagsNBT... nbt ) {
-		scanEntities.add(new EntityTags(entityName,aspects,nbt));
-	}
-	
-	//RECIPES/////////////////////////////////////////
-	private static ArrayList craftingRecipes = new ArrayList();	
-	private static HashMap<Object,ItemStack> smeltingBonus = new HashMap<Object,ItemStack>();
-	
-	/**
-	 * This method is used to determine what bonus items are generated when the infernal furnace smelts items
-	 * @param in The input of the smelting operation. e.g. new ItemStack(Block.oreGold)
-	 * @param out The bonus item that can be produced from the smelting operation e.g. new ItemStack(nuggetGold,0,0).
-	 * Stacksize should be 0 unless you want to guarantee that at least 1 item is always produced.
-	 */
-	public static void addSmeltingBonus(ItemStack in, ItemStack out) {
-		smeltingBonus.put(
-				Arrays.asList(in.getItem(),in.getItemDamage()), 
-				new ItemStack(out.getItem(),0,out.getItemDamage()));
-	}
-	
-	/**
-	 * This method is used to determine what bonus items are generated when the infernal furnace smelts items
-	 * @param in The ore dictionary input of the smelting operation. e.g. "oreGold"
-	 * @param out The bonus item that can be produced from the smelting operation e.g. new ItemStack(nuggetGold,0,0).
-	 * Stacksize should be 0 unless you want to guarantee that at least 1 item is always produced.
-	 */
-	public static void addSmeltingBonus(String in, ItemStack out) {
-		smeltingBonus.put(	in, new ItemStack(out.getItem(),0,out.getItemDamage()));
-	}
-	
-	/**
-	 * Returns the bonus item produced from a smelting operation in the infernal furnace
-	 * @param in The input of the smelting operation. e.g. new ItemStack(oreGold)
-	 * @return the The bonus item that can be produced
-	 */
-	public static ItemStack getSmeltingBonus(ItemStack in) {
-		ItemStack out = smeltingBonus.get(Arrays.asList(in.getItem(),in.getItemDamage()));
-		if (out==null) {
-			out = smeltingBonus.get(Arrays.asList(in.getItem(),OreDictionary.WILDCARD_VALUE));
-		}
-		if (out==null) {
-			String od = OreDictionary.getOreName( OreDictionary.getOreID(in));
-			out = smeltingBonus.get(od);
-		}
-		return out;
-	}
-	
-	public static List getCraftingRecipes() {
-		return craftingRecipes;
-	}
-	
-	/**
-	 * @param research the research key required for this recipe to work. Leave blank if it will work without research
-	 * @param result the recipe output
-	 * @param aspects the vis cost per aspect. 
-	 * @param recipe The recipe. Format is exactly the same as vanilla recipes. Input itemstacks are NBT sensitive.
-	 */
-	public static ShapedArcaneRecipe addArcaneCraftingRecipe(String research, ItemStack result, AspectList aspects, Object ... recipe)
-    {
-		ShapedArcaneRecipe r= new ShapedArcaneRecipe(research, result, aspects, recipe);
-        craftingRecipes.add(r);
-		return r;
-    }
-	
-	/**
-	 * @param research the research key required for this recipe to work. Leave blank if it will work without research
-	 * @param result the recipe output
-	 * @param aspects the vis cost per aspect
-	 * @param recipe The recipe. Format is exactly the same as vanilla shapeless recipes. Input itemstacks are NBT sensitive.
-	 */
-	public static ShapelessArcaneRecipe addShapelessArcaneCraftingRecipe(String research, ItemStack result, AspectList aspects, Object ... recipe)
-    {
-		ShapelessArcaneRecipe r = new ShapelessArcaneRecipe(research, result, aspects, recipe);
-        craftingRecipes.add(r);
-		return r;
-    }
-	
-	/**
-	 * @param research the research key required for this recipe to work. Leave blank if it will work without research
-	 * @param result the recipe output. It can either be an itemstack or an nbt compound tag that will be added to the central item
-	 * @param instability a number that represents the N in 1000 chance for the infusion altar to spawn an
-	 * 		  instability effect each second while the crafting is in progress
-	 * @param aspects the essentia cost per aspect. 
-	 * @param aspects input the central item to be infused
-	 * @param recipe An array of items required to craft this. Input itemstacks are NBT sensitive. 
-	 * 				Infusion crafting components are automatically "fuzzy" and the oredict will be checked for possible matches.
-	 * 
-	 */
-	public static InfusionRecipe addInfusionCraftingRecipe(String research, Object result, int instability, AspectList aspects, ItemStack input,ItemStack[] recipe)
-    {
-		if (!(result instanceof ItemStack || result instanceof Object[])) return null;
-		InfusionRecipe r= new InfusionRecipe(research, result, instability, aspects, input, recipe);
-        craftingRecipes.add(r);
-		return r;
-    }
-	
-	/**
-	 * @param research the research key required for this recipe to work. Leave blank if it will work without research
-	 * @param enchantment the enchantment that will be applied to the item
-	 * @param instability a number that represents the N in 1000 chance for the infusion altar to spawn an
-	 * 		  instability effect each second while the crafting is in progress
-	 * @param aspects the essentia cost per aspect. 
-	 * @param recipe An array of items required to craft this. Input itemstacks are NBT sensitive. 
-	 * 				Infusion crafting components are automatically "fuzzy" and the oredict will be checked for possible matches.
-	 * 
-	 */
-	public static InfusionEnchantmentRecipe addInfusionEnchantmentRecipe(String research, Enchantment enchantment, int instability, AspectList aspects, ItemStack[] recipe)
-    {
-		InfusionEnchantmentRecipe r= new InfusionEnchantmentRecipe(research, enchantment, instability, aspects, recipe);
-        craftingRecipes.add(r);
-		return r;
-    }
-	
-	/**
-	 * @param stack the recipe result
-	 * @return the recipe
-	 */
-	public static InfusionRecipe getInfusionRecipe(ItemStack res) {
-		for (Object r:getCraftingRecipes()) {
-			if (r instanceof InfusionRecipe) {
-				if (((InfusionRecipe)r).getRecipeOutput() instanceof ItemStack) {
-					if (((ItemStack) ((InfusionRecipe)r).getRecipeOutput()).isItemEqual(res))
-						return (InfusionRecipe)r;
-				} 
-			}
-		}
-		return null;
-	}
-
-    
-    /**
-     * @param key the research key required for this recipe to work. 
-     * @param result the output result
-     * @param catalyst an itemstack of the catalyst or a string if it is an ore dictionary item
-     * @param cost the vis cost
-     * @param tags the aspects required to craft this
-     */
-    public static CrucibleRecipe addCrucibleRecipe(String key, ItemStack result, Object catalyst, AspectList tags) {
-    	CrucibleRecipe rc = new CrucibleRecipe(key, result, catalyst, tags);
-    	getCraftingRecipes().add(rc);
-		return rc;
-	}
-    
-	
-	/**
-	 * @param stack the recipe result
-	 * @return the recipe
-	 */
-	public static CrucibleRecipe getCrucibleRecipe(ItemStack stack) {
-		for (Object r:getCraftingRecipes()) {
-			if (r instanceof CrucibleRecipe) {
-				if (((CrucibleRecipe)r).getRecipeOutput().isItemEqual(stack))
-					return (CrucibleRecipe)r;
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * @param hash the unique recipe code
-	 * @return the recipe
-	 */
-	public static CrucibleRecipe getCrucibleRecipeFromHash(int hash) {
-		for (Object r:getCraftingRecipes()) {
-			if (r instanceof CrucibleRecipe) {
-				if (((CrucibleRecipe)r).hash==hash)
-					return (CrucibleRecipe)r;
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Used by the thaumonomicon drilldown feature.
-	 * @param stack the item
-	 * @return the thaumcraft recipe key that produces that item. 
-	 */
-	private static HashMap<int[],Object[]> keyCache = new HashMap<int[],Object[]>();
-	
-	public static Object[] getCraftingRecipeKey(EntityPlayer player, ItemStack stack) {
-		int[] key = new int[] {Item.getIdFromItem(stack.getItem()),stack.getItemDamage()};
-		if (keyCache.containsKey(key)) {
-			if (keyCache.get(key)==null) return null;
-			if (ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), (String)(keyCache.get(key))[0]))
-				return keyCache.get(key);
-			else 
-				return null;
-		}
-		for (ResearchCategoryList rcl:ResearchCategories.researchCategories.values()) {
-			for (ResearchItem ri:rcl.research.values()) {
-				if (ri.getPages()==null) continue;
-				for (int a=0;a<ri.getPages().length;a++) {
-					ResearchPage page = ri.getPages()[a];
-					if (page.recipe!=null && page.recipe instanceof CrucibleRecipe[]) {
-						CrucibleRecipe[] crs = (CrucibleRecipe[]) page.recipe;
-						for (CrucibleRecipe cr:crs) {
-							if (cr.getRecipeOutput().isItemEqual(stack)) {
-								keyCache.put(key,new Object[] {ri.key,a});
-								if (ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), ri.key))
-									return new Object[] {ri.key,a};
-							}
-						}
-					} else
-					if (page.recipeOutput!=null && stack !=null && page.recipeOutput.isItemEqual(stack)) {
-						keyCache.put(key,new Object[] {ri.key,a});
-						if (ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), ri.key))
-							return new Object[] {ri.key,a};
-						else 
-							return null;
-					}
-				}
-			}
-		}
-		keyCache.put(key,null);
-		return null;
-	}
-	
-	//ASPECTS////////////////////////////////////////
-	
-	public static ConcurrentHashMap<List,AspectList> objectTags = new ConcurrentHashMap<List,AspectList>();
-	public static ConcurrentHashMap<List,int[]> groupedObjectTags = new ConcurrentHashMap<List,int[]>();
-	
-	/**
-	 * Checks to see if the passed item/block already has aspects associated with it.
-	 * @param id
-	 * @param meta
-	 * @return 
-	 */
-	public static boolean exists(Item item, int meta) {
-		AspectList tmp = ThaumcraftApi.objectTags.get(Arrays.asList(item,meta));
-		if (tmp==null) {
-			tmp = ThaumcraftApi.objectTags.get(Arrays.asList(item,OreDictionary.WILDCARD_VALUE));
-			if (meta==OreDictionary.WILDCARD_VALUE && tmp==null) {
-				int index=0;
-				do {
-					tmp = ThaumcraftApi.objectTags.get(Arrays.asList(item,index));
-					index++;
-				} while (index<16 && tmp==null);
-			}
-			if (tmp==null) return false;
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * Used to assign apsects to the given item/block. Here is an example of the declaration for cobblestone:<p>
-	 * <i>ThaumcraftApi.registerObjectTag(new ItemStack(Blocks.cobblestone), (new AspectList()).add(Aspect.ENTROPY, 1).add(Aspect.EARTH, 1));</i>
-	 * @param item the item passed. Pass OreDictionary.WILDCARD_VALUE if all damage values of this item/block should have the same aspects
-	 * @param aspects A ObjectTags object of the associated aspects
-	 */
-	public static void registerObjectTag(ItemStack item, AspectList aspects) {
-		if (aspects==null) aspects=new AspectList();
-		try {
-		objectTags.put(Arrays.asList(item.getItem(),item.getItemDamage()), aspects);
-		} catch (Exception e) {}
-	}	
-	
-	
-	/**
-	 * Used to assign apsects to the given item/block. Here is an example of the declaration for cobblestone:<p>
-	 * <i>ThaumcraftApi.registerObjectTag(new ItemStack(Blocks.cobblestone), new int[]{0,1}, (new AspectList()).add(Aspect.ENTROPY, 1).add(Aspect.EARTH, 1));</i>
-	 * @param item
-	 * @param meta A range of meta values if you wish to lump several item meta's together as being the "same" item (i.e. stair orientations)
-	 * @param aspects A ObjectTags object of the associated aspects
-	 */
-	public static void registerObjectTag(ItemStack item, int[] meta, AspectList aspects) {
-		if (aspects==null) aspects=new AspectList();
-		try {			
-			objectTags.put(Arrays.asList(item.getItem(),meta[0]), aspects);
-			for (int m:meta) {				
-				groupedObjectTags.put(Arrays.asList(item.getItem(),m), meta);
-			}
-			
-		} catch (Exception e) {}
-	}
-	
-	/**
-	 * Used to assign apsects to the given ore dictionary item. 
-	 * @param oreDict the ore dictionary name
-	 * @param aspects A ObjectTags object of the associated aspects
-	 */
-	public static void registerObjectTag(String oreDict, AspectList aspects) {
-		if (aspects==null) aspects=new AspectList();
-		ArrayList<ItemStack> ores = OreDictionary.getOres(oreDict);
-		if (ores!=null && ores.size()>0) {
-			for (ItemStack ore:ores) {
-				try {
-				objectTags.put(Arrays.asList(ore.getItem(), ore.getItemDamage()), aspects);
-				} catch (Exception e) {}
-			}
-		}
-	}
-	
-	/**
-	 * Used to assign aspects to the given item/block. 
-	 * Attempts to automatically generate aspect tags by checking registered recipes.
-	 * Here is an example of the declaration for pistons:<p>
-	 * <i>ThaumcraftApi.registerComplexObjectTag(new ItemStack(Blocks.cobblestone), (new AspectList()).add(Aspect.MECHANISM, 2).add(Aspect.MOTION, 4));</i>
-	 * IMPORTANT - this should only be used if you are not happy with the default aspects the object would be assigned.
-	 * @param item, pass OreDictionary.WILDCARD_VALUE to meta if all damage values of this item/block should have the same aspects
-	 * @param aspects A ObjectTags object of the associated aspects
-	 */
-	public static void registerComplexObjectTag(ItemStack item, AspectList aspects ) {
-		if (!exists(item.getItem(),item.getItemDamage())) {
-			AspectList tmp = ThaumcraftApiHelper.generateTags(item.getItem(), item.getItemDamage());
-			if (tmp != null && tmp.size()>0) {
-				for(Aspect tag:tmp.getAspects()) {
-					aspects.add(tag, tmp.getAmount(tag));
-				}
-			}
-			registerObjectTag(item,aspects);
-		} else {
-			AspectList tmp = ThaumcraftApiHelper.getObjectAspects(item);
-			for(Aspect tag:aspects.getAspects()) {
-				tmp.merge(tag, tmp.getAmount(tag));
-			}
-			registerObjectTag(item,tmp);
-		}
-	}
-	
-	//WARP ///////////////////////////////////////////////////////////////////////////////////////
-		private static HashMap<Object,Integer> warpMap = new HashMap<Object,Integer>();
-		
-		/**
-		 * This method is used to determine how much warp is gained if the item is crafted. The warp
-		 * added is "sticky" warp
-		 * @param craftresult The item crafted
-		 * @param amount how much warp is gained
-		 */
-		public static void addWarpToItem(ItemStack craftresult, int amount) {
-			warpMap.put(Arrays.asList(craftresult.getItem(),craftresult.getItemDamage()),amount);
-		}
-		
-		/**
-		 * This method is used to determine how much permanent warp is gained if the research is completed
-		 * @param in The item crafted
-		 * @param amount how much warp is gained
-		 */
-		public static void addWarpToResearch(String research, int amount) {
-			warpMap.put(research, amount);
-		}
-		
-		/**
-		 * Returns how much warp is gained from the item or research passed in
-		 * @param in itemstack or string
-		 * @return how much warp it will give
-		 */
-		public static int getWarp(Object in) {
-			if (in==null) return 0;
-			if (in instanceof ItemStack && warpMap.containsKey(Arrays.asList(((ItemStack)in).getItem(),((ItemStack)in).getItemDamage()))) {
-				return warpMap.get(Arrays.asList(((ItemStack)in).getItem(),((ItemStack)in).getItemDamage()));
-			} else
-			if (in instanceof String && warpMap.containsKey((String)in)) {
-				return warpMap.get((String)in);
-			}
-			return 0;
-		}
-	
-	//LOOT BAGS //////////////////////////////////////////////////////////////////////////////////////////
-		
-		/**
-		 * Used to add possible loot to treasure bags. As a reference, the weight of gold coins are 2000 
-		 * and a diamond is 50.
-		 * The weights are the same for all loot bag types - the only difference is how many items the bag
-		 * contains.
-		 * @param item
-		 * @param weight
-		 * @param bagTypes array of which type of bag to add this loot to. Multiple types can be specified
-		 * 0 = common, 1 = uncommon, 2 = rare
-		 */
-		public static void addLootBagItem(ItemStack item, int weight, int... bagTypes) {
-			if (bagTypes==null || bagTypes.length==0)
-				WeightedRandomLoot.lootBagCommon.add(new WeightedRandomLoot(item,weight));
-			else {
-				for (int rarity:bagTypes) {
-					switch(rarity) {
-						case 0: WeightedRandomLoot.lootBagCommon.add(new WeightedRandomLoot(item,weight)); break;
-						case 1: WeightedRandomLoot.lootBagUncommon.add(new WeightedRandomLoot(item,weight)); break;
-						case 2: WeightedRandomLoot.lootBagRare.add(new WeightedRandomLoot(item,weight)); break;
-					}
-				}
-			}
-		}
-		
-	//CROPS //////////////////////////////////////////////////////////////////////////////////////////
-	
-	/**
-	 * To define mod crops you need to use FMLInterModComms in your @Mod.Init method.
-	 * There are two 'types' of crops you can add. Standard crops and clickable crops.
-	 * 
-	 * Standard crops work like normal vanilla crops - they grow until a certain metadata 
-	 * value is reached and you harvest them by destroying the block and collecting the blocks.
-	 * You need to create and ItemStack that tells the golem what block id and metadata represents
-	 * the crop when fully grown. Sending a metadata of [OreDictionary.WILDCARD_VALUE] will mean the metadata won't get 
-	 * checked.
-	 * Example for vanilla wheat: 
-	 * FMLInterModComms.sendMessage("Thaumcraft", "harvestStandardCrop", new ItemStack(Block.crops,1,7));
-	 *  
-	 * Clickable crops are crops that you right click to gather their bounty instead of destroying them.
-	 * As for standard crops, you need to create and ItemStack that tells the golem what block id 
-	 * and metadata represents the crop when fully grown. The golem will trigger the blocks onBlockActivated method. 
-	 * Sending a metadata of [OreDictionary.WILDCARD_VALUE] will mean the metadata won't get checked.
-	 * Example (this will technically do nothing since clicking wheat does nothing, but you get the idea): 
-	 * FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(Block.crops,1,7));
-	 * 
-	 * Stacked crops (like reeds) are crops that you wish the bottom block should remain after harvesting.
-	 * As for standard crops, you need to create and ItemStack that tells the golem what block id 
-	 * and metadata represents the crop when fully grown. Sending a metadata of [OreDictionary.WILDCARD_VALUE] will mean the actualy md won't get 
-	 * checked. If it has the order upgrade it will only harvest if the crop is more than one block high.
-	 * Example: 
-	 * FMLInterModComms.sendMessage("Thaumcraft", "harvestStackedCrop", new ItemStack(Block.reed,1,7));
-	 */
-	
-	//NATIVE CLUSTERS //////////////////////////////////////////////////////////////////////////////////
-	
-	/**
-	 * You can define certain ores that will have a chance to produce native clusters via FMLInterModComms 
-	 * in your @Mod.Init method using the "nativeCluster" string message.
-	 * The format should be: 
-	 * "[ore item/block id],[ore item/block metadata],[cluster item/block id],[cluster item/block metadata],[chance modifier float]"
-	 * 
-	 * NOTE: The chance modifier is a multiplier applied to the default chance for that cluster to be produced (default 27.5% for a pickaxe of the core)
-	 * 
-	 * Example for vanilla iron ore to produce one of my own native iron clusters (assuming default id's) at double the default chance: 
-	 * FMLInterModComms.sendMessage("Thaumcraft", "nativeCluster","15,0,25016,16,2.0");
-	 */
-	
-	//LAMP OF GROWTH BLACKLIST ///////////////////////////////////////////////////////////////////////////
-	/**
-	 * You can blacklist crops that should not be effected by the Lamp of Growth via FMLInterModComms 
-	 * in your @Mod.Init method using the "lampBlacklist" itemstack message.
-	 * Sending a metadata of [OreDictionary.WILDCARD_VALUE] will mean the metadata won't get checked.
-	 * Example for vanilla wheat: 
-	 * FMLInterModComms.sendMessage("Thaumcraft", "lampBlacklist", new ItemStack(Block.crops,1,OreDictionary.WILDCARD_VALUE));
-	 */
-	
-	//DIMENSION BLACKLIST ///////////////////////////////////////////////////////////////////////////
-	/**
-	 * You can blacklist a dimension to not spawn certain thaumcraft features 
-	 * in your @Mod.Init method using the "dimensionBlacklist" string message in the format "[dimension]:[level]"
-	 * The level values are as follows:
-	 * [0] stop all tc spawning and generation
-	 * [1] allow ore and node generation (and node special features)
-	 * [2] allow mob spawning
-	 * [3] allow ore and node gen + mob spawning (and node special features)
-	 * Example: 
-	 * FMLInterModComms.sendMessage("Thaumcraft", "dimensionBlacklist", "15:1");
-	 */
-	
-	//BIOME BLACKLIST ///////////////////////////////////////////////////////////////////////////
-	/**
-	 * You can blacklist a biome to not spawn certain thaumcraft features 
-	 * in your @Mod.Init method using the "biomeBlacklist" string message in the format "[biome id]:[level]"
-	 * The level values are as follows:
-	 * [0] stop all tc spawning and generation
-	 * [1] allow ore and node generation (and node special features)
-	 * [2] allow mob spawning
-	 * [3] allow ore and node gen + mob spawning (and node special features)
-	 * Example: 
-	 * FMLInterModComms.sendMessage("Thaumcraft", "biomeBlacklist", "180:2");
-	 */
-		
-	//CHAMPION MOB WHITELIST ///////////////////////////////////////////////////////////////////////////
-	/**
-	 * You can whitelist an entity class so it can rarely spawn champion versions in your @Mod.Init method using 
-	 * the "championWhiteList" string message in the format "[Entity]:[level]"
-	 * The entity must extend EntityMob.
-	 * [Entity] is in a similar format to what is used for mob spawners and such (see EntityList.class for vanilla examples).
-	 * The [level] value indicate how rare the champion version will be - the higher the number the more common. 
-	 * The number roughly equals the [n] in 100 chance of a mob being a champion version. 
-	 * You can give 0 or negative numbers to allow champions to spawn with a very low chance only in particularly dangerous places. 
-	 * However anything less than about -2 will probably result in no spawns at all.
-	 * Example: 
-	 * FMLInterModComms.sendMessage("Thaumcraft", "championWhiteList", "Thaumcraft.Wisp:1");
-	 */
-}
@@ -1,201 +0,0 @@
-package thaumcraft.api.aspects;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.StatCollector;
-
-import org.apache.commons.lang3.text.WordUtils;
-
-public class Aspect {
-	
-	String tag;
-	Aspect[] components;
-	int color;
-	private String chatcolor;
-	ResourceLocation image;
-	int blend;
-
-	/**
-	 * Use this constructor to register your own aspects.
-	 * @param tag the key that will be used to reference this aspect, as well as its latin display name
-	 * @param color color to display the tag in
-	 * @param components the aspects this one is formed from
-	 * @param image ResourceLocation pointing to a 32x32 icon of the aspect
-	 * @param blend GL11 blendmode (1 or 771). Used for rendering nodes. Default is 1
-	 */
-	public Aspect(String tag, int color, Aspect[] components, ResourceLocation image, int blend) {
-		if (aspects.containsKey(tag)) throw new IllegalArgumentException(tag+" already registered!");
-		this.tag = tag;
-		this.components = components;
-		this.color = color;
-		this.image = image;
-		this.blend = blend;
-		aspects.put(tag, this);
-	}
-	
-	/**
-	 * Shortcut constructor I use for the default aspects - you shouldn't be using this.
-	 */
-	public Aspect(String tag, int color, Aspect[] components) {
-		this(tag,color,components,new ResourceLocation("thaumcraft","textures/aspects/"+tag.toLowerCase()+".png"),1);
-	}
-	
-	/**
-	 * Shortcut constructor I use for the default aspects - you shouldn't be using this.
-	 */
-	public Aspect(String tag, int color, Aspect[] components, int blend) {
-		this(tag,color,components,new ResourceLocation("thaumcraft","textures/aspects/"+tag.toLowerCase()+".png"),blend);
-	}
-
-	/**
-	 * Shortcut constructor I use for the primal aspects - 
-	 * you shouldn't use this as making your own primal aspects will break all the things.
-	 */
-	public Aspect(String tag, int color, String chatcolor, int blend) {
-		this(tag,color,(Aspect[])null, blend);
-		this.setChatcolor(chatcolor);
-	}
-	
-	public int getColor() {
-		return color;
-	}
-	
-	public String getName() {
-		return WordUtils.capitalizeFully(tag);
-	}
-	
-	public String getLocalizedDescription() {
-		return StatCollector.translateToLocal("tc.aspect."+tag);
-	}
-	
-	public String getTag() {
-		return tag;
-	}
-
-	public void setTag(String tag) {
-		this.tag = tag;
-	}
-
-	public Aspect[] getComponents() {
-		return components;
-	}
-
-	public void setComponents(Aspect[] components) {
-		this.components = components;
-	}
-	
-	public ResourceLocation getImage() {
-		return image;
-	}
-	
-	public static Aspect getAspect(String tag) {
-		return aspects.get(tag);
-	}
-	
-	public int getBlend() {
-		return blend;
-	}
-
-	public void setBlend(int blend) {
-		this.blend = blend;
-	}
-	
-	public boolean isPrimal() {
-		return getComponents()==null || getComponents().length!=2;
-	}
-	
-	///////////////////////////////
-	public static ArrayList<Aspect> getPrimalAspects() {
-		ArrayList<Aspect> primals = new ArrayList<Aspect>();
-		Collection<Aspect> pa = aspects.values();
-		for (Aspect aspect:pa) {
-			if (aspect.isPrimal())  primals.add(aspect);
-		}
-		return primals;
-	}
-	
-	public static ArrayList<Aspect> getCompoundAspects() {
-		ArrayList<Aspect> compounds = new ArrayList<Aspect>();
-		Collection<Aspect> pa = aspects.values();
-		for (Aspect aspect:pa) {
-			if (!aspect.isPrimal())  compounds.add(aspect);
-		}
-		return compounds;
-	}
-
-	public String getChatcolor() {
-		return chatcolor;
-	}
-
-	public void setChatcolor(String chatcolor) {
-		this.chatcolor = chatcolor;
-	}
-	
-
-	///////////////////////////////
-	public static LinkedHashMap<String,Aspect> aspects = new LinkedHashMap<String,Aspect>();
-	
-	//PRIMAL
-		public static final Aspect AIR = new Aspect("aer",0xffff7e,"e",1);
-		public static final Aspect EARTH = new Aspect("terra",0x56c000,"2",1);
-		public static final Aspect FIRE = new Aspect("ignis",0xff5a01,"c",1);
-		public static final Aspect WATER = new Aspect("aqua",0x3cd4fc,"3",1);
-		public static final Aspect ORDER = new Aspect("ordo",0xd5d4ec,"7",1);
-		public static final Aspect ENTROPY = new Aspect("perditio",0x404040,"8",771);
-	
-	//SECONDARY  	
-		public static final Aspect VOID = new Aspect("vacuos",0x888888, new Aspect[] {AIR, ENTROPY},771);
-		public static final Aspect LIGHT = new Aspect("lux",0xfff663, new Aspect[] {AIR, FIRE});
-		public static final Aspect WEATHER = new Aspect("tempestas",0xFFFFFF, new Aspect[] {AIR, WATER});
-		public static final Aspect MOTION = new Aspect("motus",0xcdccf4, new Aspect[] {AIR, ORDER});
-		public static final Aspect COLD = new Aspect("gelum",0xe1ffff, new Aspect[] {FIRE, ENTROPY});
-		public static final Aspect CRYSTAL = new Aspect("vitreus",0x80ffff, new Aspect[] {EARTH, ORDER});
-		public static final Aspect LIFE = new Aspect("victus",0xde0005, new Aspect[] {WATER, EARTH});
-		public static final Aspect POISON = new Aspect("venenum",0x89f000,  new Aspect[] {WATER, ENTROPY});	
-		public static final Aspect ENERGY = new Aspect("potentia",0xc0ffff, new Aspect[] {ORDER, FIRE});
-		public static final Aspect EXCHANGE = new Aspect("permutatio",0x578357, new Aspect[] {ENTROPY, ORDER});
-//		public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {AIR, EARTH});
-//		public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {FIRE, EARTH});
-//		public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {FIRE, WATER});
-//		public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {ORDER, WATER});
-//		public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {EARTH, ENTROPY});
-		
-	//TERTIARY  			
-		public static final Aspect METAL = new Aspect("metallum",0xb5b5cd, new Aspect[] {EARTH, CRYSTAL});
-		public static final Aspect DEATH = new Aspect("mortuus",0x887788, new Aspect[] {LIFE, ENTROPY});
-		public static final Aspect FLIGHT = new Aspect("volatus",0xe7e7d7, new Aspect[] {AIR, MOTION});
-		public static final Aspect DARKNESS = new Aspect("tenebrae",0x222222, new Aspect[] {VOID, LIGHT});
-		public static final Aspect SOUL = new Aspect("spiritus",0xebebfb, new Aspect[] {LIFE, DEATH});
-		public static final Aspect HEAL = new Aspect("sano",0xff2f34, new Aspect[] {LIFE, ORDER});
-		public static final Aspect TRAVEL = new Aspect("iter",0xe0585b, new Aspect[] {MOTION, EARTH});
-		public static final Aspect ELDRITCH = new Aspect("alienis",0x805080, new Aspect[] {VOID, DARKNESS});
-		public static final Aspect MAGIC = new Aspect("praecantatio",0x9700c0, new Aspect[] {VOID, ENERGY});
-		public static final Aspect AURA = new Aspect("auram",0xffc0ff, new Aspect[] {MAGIC, AIR});
-		public static final Aspect TAINT = new Aspect("vitium",0x800080, new Aspect[] {MAGIC, ENTROPY});
-		public static final Aspect SLIME = new Aspect("limus",0x01f800, new Aspect[] {LIFE, WATER});
-		public static final Aspect PLANT = new Aspect("herba",0x01ac00, new Aspect[] {LIFE, EARTH});
-		public static final Aspect TREE = new Aspect("arbor",0x876531, new Aspect[] {AIR, PLANT});		
-		public static final Aspect BEAST = new Aspect("bestia",0x9f6409, new Aspect[] {MOTION, LIFE});
-		public static final Aspect FLESH = new Aspect("corpus",0xee478d, new Aspect[] {DEATH, BEAST});
-		public static final Aspect UNDEAD = new Aspect("exanimis",0x3a4000, new Aspect[] {MOTION, DEATH});
-		public static final Aspect MIND = new Aspect("cognitio",0xffc2b3, new Aspect[] {FIRE, SOUL});
-		public static final Aspect SENSES = new Aspect("sensus",0x0fd9ff, new Aspect[] {AIR, SOUL});
-		public static final Aspect MAN = new Aspect("humanus",0xffd7c0, new Aspect[] {BEAST, MIND});
-		public static final Aspect CROP = new Aspect("messis",0xe1b371, new Aspect[] {PLANT, MAN});		
-		public static final Aspect MINE = new Aspect("perfodio",0xdcd2d8, new Aspect[] {MAN, EARTH});
-		public static final Aspect TOOL = new Aspect("instrumentum",0x4040ee, new Aspect[] {MAN, ORDER});
-		public static final Aspect HARVEST = new Aspect("meto",0xeead82, new Aspect[] {CROP, TOOL});
-		public static final Aspect WEAPON = new Aspect("telum",0xc05050, new Aspect[] {TOOL, FIRE});
-		public static final Aspect ARMOR = new Aspect("tutamen",0x00c0c0, new Aspect[] {TOOL, EARTH});
-		public static final Aspect HUNGER = new Aspect("fames",0x9a0305, new Aspect[] {LIFE, VOID});
-		public static final Aspect GREED = new Aspect("lucrum",0xe6be44, new Aspect[] {MAN, HUNGER});
-		public static final Aspect CRAFT = new Aspect("fabrico",0x809d80, new Aspect[] {MAN, TOOL});
-		public static final Aspect CLOTH = new Aspect("pannus",0xeaeac2, new Aspect[] {TOOL, BEAST});
-		public static final Aspect MECHANISM = new Aspect("machina",0x8080a0, new Aspect[] {MOTION, TOOL});
-		public static final Aspect TRAP = new Aspect("vinculum",0x9a8080, new Aspect[] {MOTION, ENTROPY});				
-		
-		
-}
@@ -1,292 +0,0 @@
-package thaumcraft.api.aspects;
-
-import java.io.Serializable;
-import java.util.LinkedHashMap;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import thaumcraft.api.ThaumcraftApiHelper;
-
-public class AspectList implements Serializable {
-	
-	public LinkedHashMap<Aspect,Integer> aspects = new LinkedHashMap<Aspect,Integer>();//aspects associated with this object
-
-	
-	/**
-	 * this creates a new aspect list with preloaded values based off the aspects of the given item.
-	 * @param the itemstack of the given item
-	 */
-	public AspectList(ItemStack stack) {
-		try {
-			AspectList temp = ThaumcraftApiHelper.getObjectAspects(stack);
-			if (temp!=null)
-			for (Aspect tag:temp.getAspects()) {
-				add(tag,temp.getAmount(tag));
-			}
-		} catch (Exception e) {}
-	}
-	
-	public AspectList() {
-	}
-	
-	public AspectList copy() {
-		AspectList out = new AspectList();
-		for (Aspect a:this.getAspects())
-			out.add(a, this.getAmount(a));
-		return out;
-	}
-	
-	/**
-	 * @return the amount of different aspects in this collection
-	 */
-	public int size() {
-		return aspects.size();
-	}
-	
-	/**
-	 * @return the amount of total vis in this collection
-	 */
-	public int visSize() {
-		int q = 0;
-		
-		for (Aspect as:aspects.keySet()) {
-			q+=this.getAmount(as);
-		}
-		
-		return q;
-	}
-	
-	/**
-	 * @return an array of all the aspects in this collection
-	 */
-	public Aspect[] getAspects() {
-		Aspect[] q = new Aspect[1];
-		return aspects.keySet().toArray(q);
-	}
-	
-	/**
-	 * @return an array of all the aspects in this collection
-	 */
-	public Aspect[] getPrimalAspects() {
-		AspectList t = new AspectList();
-		for (Aspect as:aspects.keySet()) {
-			if (as.isPrimal()) {
-				t.add(as,1);
-			}
-		}
-		Aspect[] q = new Aspect[1];
-		return t.aspects.keySet().toArray(q);
-	}
-	
-	/**
-	 * @return an array of all the aspects in this collection sorted by name
-	 */
-	public Aspect[] getAspectsSorted() {
-		try {
-			Aspect[] out = aspects.keySet().toArray(new Aspect[]{});
-			boolean change=false;
-			do {
-				change=false;
-				for(int a=0;a<out.length-1;a++) {
-					Aspect e1 = out[a];
-					Aspect e2 = out[a+1];
-					if (e1!=null && e2!=null && e1.getTag().compareTo(e2.getTag())>0) {
-						out[a] = e2;
-						out[a+1] = e1;
-						change = true;
-						break;
-					}
-				}
-			} while (change==true);
-			return out;
-		} catch (Exception e) {
-			return this.getAspects(); 
-		}
-	}
-	
-	/**
-	 * @return an array of all the aspects in this collection sorted by amount
-	 */
-	public Aspect[] getAspectsSortedAmount() {
-		try {
-			Aspect[] out = aspects.keySet().toArray(new Aspect[1]);
-			boolean change=false;
-			do {
-				change=false;
-				for(int a=0;a<out.length-1;a++) {
-					int e1 = getAmount(out[a]); 
-					int e2 = getAmount(out[a+1]);
-					if (e1>0 && e2>0 && e2>e1) {
-						Aspect ea = out[a];
-						Aspect eb = out[a+1];
-						out[a] = eb;
-						out[a+1] = ea;
-						change = true;
-						break;
-					}
-				}
-			} while (change==true);
-			return out;
-		} catch (Exception e) {
-			return this.getAspects();
-		}
-	}
-	
-	/**
-	 * @param key
-	 * @return the amount associated with the given aspect in this collection
-	 */
-	public int getAmount(Aspect key) {
-		return  aspects.get(key)==null?0:aspects.get(key);
-	}
-	
-	/**
-	 * Reduces the amount of an aspect in this collection by the given amount. 
-	 * @param key
-	 * @param amount
-	 * @return 
-	 */
-	public boolean reduce(Aspect key, int amount) {
-		if (getAmount(key)>=amount) {
-			int am = getAmount(key)-amount;
-			aspects.put(key, am);
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Reduces the amount of an aspect in this collection by the given amount. 
-	 * If reduced to 0 or less the aspect will be removed completely. 
-	 * @param key
-	 * @param amount
-	 * @return
-	 */
-	public AspectList remove(Aspect key, int amount) {
-		int am = getAmount(key)-amount;
-		if (am<=0) aspects.remove(key); else
-		this.aspects.put(key, am);
-		return this;
-	}
-	
-	/**
-	 * Simply removes the aspect from the list
-	 * @param key
-	 * @param amount
-	 * @return
-	 */
-	public AspectList remove(Aspect key) {
-		aspects.remove(key); 
-		return this;
-	}
-	
-	/**
-	 * Adds this aspect and amount to the collection. 
-	 * If the aspect exists then its value will be increased by the given amount.
-	 * @param aspect
-	 * @param amount
-	 * @return
-	 */
-	public AspectList add(Aspect aspect, int amount) {
-		if (this.aspects.containsKey(aspect)) {
-			int oldamount = this.aspects.get(aspect);
-			amount+=oldamount;
-		}
-		this.aspects.put( aspect, amount );
-		return this;
-	}
-
-	
-	/**
-	 * Adds this aspect and amount to the collection. 
-	 * If the aspect exists then only the highest of the old or new amount will be used.
-	 * @param aspect
-	 * @param amount
-	 * @return
-	 */
-	public AspectList merge(Aspect aspect, int amount) {
-		if (this.aspects.containsKey(aspect)) {
-			int oldamount = this.aspects.get(aspect);
-			if (amount<oldamount) amount=oldamount;
-			
-		}
-		this.aspects.put( aspect, amount );
-		return this;
-	}
-	
-	public AspectList add(AspectList in) {
-		for (Aspect a:in.getAspects()) 
-			this.add(a, in.getAmount(a));
-		return this;
-	}
-	
-	public AspectList merge(AspectList in) {
-		for (Aspect a:in.getAspects()) 
-			this.merge(a, in.getAmount(a));
-		return this;
-	}
-	
-	/**
-	 * Reads the list of aspects from nbt
-	 * @param nbttagcompound
-	 * @return 
-	 */
-	public void readFromNBT(NBTTagCompound nbttagcompound)
-    {
-        aspects.clear();
-        NBTTagList tlist = nbttagcompound.getTagList("Aspects",(byte)10);
-		for (int j = 0; j < tlist.tagCount(); j++) {
-			NBTTagCompound rs = (NBTTagCompound) tlist.getCompoundTagAt(j);
-			if (rs.hasKey("key")) {
-				add(	Aspect.getAspect(rs.getString("key")),
-						rs.getInteger("amount"));
-			}
-		}
-    }
-	
-	public void readFromNBT(NBTTagCompound nbttagcompound, String label)
-    {
-        aspects.clear();
-        NBTTagList tlist = nbttagcompound.getTagList(label,(byte)10);
-		for (int j = 0; j < tlist.tagCount(); j++) {
-			NBTTagCompound rs = (NBTTagCompound) tlist.getCompoundTagAt(j);
-			if (rs.hasKey("key")) {
-				add(	Aspect.getAspect(rs.getString("key")),
-						rs.getInteger("amount"));
-			}
-		}
-    }
-	
-	/**
-	 * Writes the list of aspects to nbt
-	 * @param nbttagcompound
-	 * @return 
-	 */
-	public void writeToNBT(NBTTagCompound nbttagcompound)
-    {
-        NBTTagList tlist = new NBTTagList();
-		nbttagcompound.setTag("Aspects", tlist);
-		for (Aspect aspect : getAspects())
-			if (aspect != null) {
-				NBTTagCompound f = new NBTTagCompound();
-				f.setString("key", aspect.getTag());
-				f.setInteger("amount", getAmount(aspect));
-				tlist.appendTag(f);
-			}
-    }
-	
-	public void writeToNBT(NBTTagCompound nbttagcompound, String label)
-    {
-        NBTTagList tlist = new NBTTagList();
-		nbttagcompound.setTag(label, tlist);
-		for (Aspect aspect : getAspects())
-			if (aspect != null) {
-				NBTTagCompound f = new NBTTagCompound();
-				f.setString("key", aspect.getTag());
-				f.setInteger("amount", getAmount(aspect));
-				tlist.appendTag(f);
-			}
-    }
-	
-}
@@ -1,19 +0,0 @@
-package thaumcraft.api.crafting;
-
-import net.minecraft.world.World;
-
-/**
- * 
- * @author Azanor
- * 
- * Blocks that implement this interface act as infusion crafting stabilisers like candles and skulls 
- *
- */
-public interface IInfusionStabiliser {
-	
-	/**
-	 * returns true if the block can stabilise things
-	 */
-	public boolean canStabaliseInfusion(World world, int x, int y, int z);
-
-}
@@ -1,133 +0,0 @@
-package thaumcraft.api.crafting;
-
-import java.util.ArrayList;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-import net.minecraftforge.oredict.OreDictionary;
-import thaumcraft.api.ThaumcraftApiHelper;
-import thaumcraft.api.aspects.AspectList;
-
-public class InfusionRecipe
-{
-	protected AspectList aspects;
-	protected String research;
-	private ItemStack[] components;
-	private ItemStack recipeInput;
-	protected Object recipeOutput;
-	protected int instability;
-	
-	public InfusionRecipe(String research, Object output, int inst,
-			AspectList aspects2, ItemStack input, ItemStack[] recipe) {
-		this.research = research;
-		this.recipeOutput = output;
-		this.recipeInput = input;
-		this.aspects = aspects2;
-		this.components = recipe;
-		this.instability = inst;
-	}
-
-	/**
-     * Used to check if a recipe matches current crafting inventory
-     * @param player 
-     */
-	public boolean matches(ArrayList<ItemStack> input, ItemStack central, World world, EntityPlayer player) {
-		if (getRecipeInput()==null) return false;
-			
-		if (research.length()>0 && !ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), research)) {
-    		return false;
-    	}
-		
-		ItemStack i2 = central.copy();
-		if (getRecipeInput().getItemDamage()==OreDictionary.WILDCARD_VALUE) {
-			i2.setItemDamage(OreDictionary.WILDCARD_VALUE);
-		}
-		
-		if (!areItemStacksEqual(i2, getRecipeInput(), true)) return false;
-		
-		ArrayList<ItemStack> ii = new ArrayList<ItemStack>();
-		for (ItemStack is:input) {
-			ii.add(is.copy());
-		}
-		
-		for (ItemStack comp:getComponents()) {
-			boolean b=false;
-			for (int a=0;a<ii.size();a++) {
-				 i2 = ii.get(a).copy();
-				if (comp.getItemDamage()==OreDictionary.WILDCARD_VALUE) {
-					i2.setItemDamage(OreDictionary.WILDCARD_VALUE);
-				}
-				if (areItemStacksEqual(i2, comp,true)) {
-					ii.remove(a);
-					b=true;
-					break;
-				}
-			}
-			if (!b) return false;
-		}
-		return ii.size()==0?true:false;
-    }
-	
-	public static boolean areItemStacksEqual(ItemStack stack0, ItemStack stack1, boolean fuzzy)
-    {
-		if (stack0==null && stack1!=null) return false;
-		if (stack0!=null && stack1==null) return false;
-		if (stack0==null && stack1==null) return true;
-		
-		//nbt
-		boolean t1=ThaumcraftApiHelper.areItemStackTagsEqualForCrafting(stack0, stack1);		
-		if (!t1) return false;
-		
-		if (fuzzy) {
-			Integer od = OreDictionary.getOreID(stack0);
-			if (od!=-1) {
-				ItemStack[] ores = OreDictionary.getOres(od).toArray(new ItemStack[]{});
-				if (ThaumcraftApiHelper.containsMatch(false, new ItemStack[]{stack1}, ores))
-					return true;
-			}
-		}
-		
-		//damage
-		boolean damage = stack0.getItemDamage() == stack1.getItemDamage() ||
-				stack1.getItemDamage() == OreDictionary.WILDCARD_VALUE;		
-		
-        return stack0.getItem() != stack1.getItem() ? false : (!damage ? false : stack0.stackSize <= stack0.getMaxStackSize() );
-    }
-	   
-    public Object getRecipeOutput() {
-		return getRecipeOutput(this.getRecipeInput());
-    }
-    
-    public AspectList getAspects() {
-		return getAspects(this.getRecipeInput());
-    }
-
-    public int getInstability() {
-		return getInstability(this.getRecipeInput());
-    }
-    
-    public String getResearch() {
-		return research;
-    }
-    
-	public ItemStack getRecipeInput() {
-		return recipeInput;
-	}
-
-	public ItemStack[] getComponents() {
-		return components;
-	}
-	
-	public Object getRecipeOutput(ItemStack input) {
-		return recipeOutput;
-    }
-    
-    public AspectList getAspects(ItemStack input) {
-		return aspects;
-    }
-    
-    public int getInstability(ItemStack input) {
-		return instability;
-    }
-}
@@ -1,3 +0,0 @@
-@API(owner = "Thaumcraft", apiVersion = "4.2.2.0", provides = "Thaumcraft|API")
-package thaumcraft.api;
-import cpw.mods.fml.common.API;
@@ -1,369 +0,0 @@
-package thaumcraft.api.research;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.StatCollector;
-import thaumcraft.api.aspects.Aspect;
-import thaumcraft.api.aspects.AspectList;
-
-public class ResearchItem 
-{
-	/**
-	 * A short string used as a key for this research. Must be unique
-	 */
-	public final String key;
-	
-	/**
-	 * A short string used as a reference to the research category to which this must be added.
-	 */
-	public final String category;
-
-	/**
-	 * The aspect tags and their values required to complete this research
-	 */
-	public final AspectList tags;
-	
-    /**
-     * This links to any research that needs to be completed before this research can be discovered or learnt.
-     */
-    public String[] parents = null;
-    
-    /**
-     * Like parent above, but a line will not be displayed in the thaumonomicon linking them. Just used to prevent clutter.
-     */
-    public String[] parentsHidden = null;
-    /**
-     * any research linked to this that will be unlocked automatically when this research is complete
-     */
-    public String[] siblings = null;
-	
-    /**
-     * the horizontal position of the research icon
-     */
-    public final int displayColumn;
-
-    /**
-     * the vertical position of the research icon
-     */
-    public final int displayRow;
-    
-    /**
-     * the icon to be used for this research 
-     */
-    public final ItemStack icon_item;
-    
-    /**
-     * the icon to be used for this research 
-     */
-    public final ResourceLocation icon_resource;
-    
-    /**
-     * How large the research grid is. Valid values are 1 to 3.
-     */
-    private int complexity;
-
-    /**
-     * Special research has a spiky border. Used for important research milestones.
-     */
-    private boolean isSpecial;
-    
-    /**
-     * Research that can be directly purchased with RP in normal research difficulty.
-     */
-    private boolean isSecondary;
-    
-	/**
-     * This indicates if the research should use a circular icon border. Usually used for "passive" research 
-     * that doesn't have recipes and grants passive effects, or that unlock automatically.
-     */
-    private boolean isRound;
-    
-    /**
-     * Stub research cannot be discovered by normal means, but can be unlocked via the sibling system.
-     */
-    private boolean isStub;
-    
-    /**
-     * This indicated that the research is completely hidden and cannot be discovered by any 
-     * player-controlled means. The recipes will never show up in the thaumonomicon.
-     * Usually used to unlock "hidden" recipes via sibling unlocking, like 
-     * the various cap and rod combos for wands.
-     */
-    private boolean isVirtual;    
-    
-    
-    
-    /**
-     * Concealed research does not display in the thaumonomicon until parent researches are discovered.
-     */
-    private boolean isConcealed;
-    
-    /**
-     * Hidden research can only be discovered via scanning or knowledge fragments 
-     */
-    private boolean isHidden;
-    
-    /**
-     * This is the same as isHidden, except it cannot be discovered with knowledge fragments, only scanning.  
-     */
-    private boolean isLost;
-    
-    /**
-     * These research items will automatically unlock for all players on game start
-     */
-    private boolean isAutoUnlock;
-    
-    /**
-     * Scanning these items will have a chance of revealing hidden knowledge in the thaumonomicon
-     */
-    private ItemStack[] itemTriggers;
-    
-    /**
-     * Scanning these entities will have a chance of revealing hidden knowledge in the thaumonomicon
-     */
-    private String[] entityTriggers;
-    
-    /**
-     * Scanning things with these aspects will have a chance of revealing hidden knowledge in the thaumonomicon
-     */
-    private Aspect[] aspectTriggers;
-
-	private ResearchPage[] pages = null;
-	
-	public ResearchItem(String key, String category)
-    {
-    	this.key = key;
-    	this.category = category;
-    	this.tags = new AspectList();    	
-        this.icon_resource = null;
-        this.icon_item = null;
-        this.displayColumn = 0;
-        this.displayRow = 0;
-        this.setVirtual();
-        
-    }
-    
-    public ResearchItem(String key, String category, AspectList tags, int col, int row, int complex, ResourceLocation icon)
-    {
-    	this.key = key;
-    	this.category = category;
-    	this.tags = tags;    	
-        this.icon_resource = icon;
-        this.icon_item = null;
-        this.displayColumn = col;
-        this.displayRow = row;
-        this.complexity = complex;
-        if (complexity < 1) this.complexity = 1;
-        if (complexity > 3) this.complexity = 3;
-    }
-    
-    public ResearchItem(String key, String category, AspectList tags, int col, int row, int complex, ItemStack icon)
-    {
-    	this.key = key;
-    	this.category = category;
-    	this.tags = tags;    	
-        this.icon_item = icon;
-        this.icon_resource = null;
-        this.displayColumn = col;
-        this.displayRow = row;
-        this.complexity = complex;
-        if (complexity < 1) this.complexity = 1;
-        if (complexity > 3) this.complexity = 3;
-    }
-
-    public ResearchItem setSpecial()
-    {
-        this.isSpecial = true;
-        return this;
-    }
-    
-    public ResearchItem setStub()
-    {
-        this.isStub = true;
-        return this;
-    }
-    
-    public ResearchItem setLost()
-    {
-        this.isLost = true;
-        return this;
-    }
-    
-    public ResearchItem setConcealed()
-    {
-        this.isConcealed = true;
-        return this;
-    }
-    
-    public ResearchItem setHidden()
-    {
-        this.isHidden = true;
-        return this;
-    }
-    
-    public ResearchItem setVirtual()
-    {
-        this.isVirtual = true;
-        return this;
-    }
-    
-    public ResearchItem setParents(String... par)
-    {
-        this.parents = par;
-        return this;
-    }
-    
-    
-
-	public ResearchItem setParentsHidden(String... par)
-    {
-        this.parentsHidden = par;
-        return this;
-    }
-    
-    public ResearchItem setSiblings(String... sib)
-    {
-        this.siblings = sib;
-        return this;
-    }
-    
-    public ResearchItem setPages(ResearchPage... par)
-    {
-        this.pages = par;
-        return this;
-    }
-    
-    public ResearchPage[] getPages() {
-		return pages;
-	}
-    
-    public ResearchItem setItemTriggers(ItemStack... par)
-    {
-        this.itemTriggers = par;
-        return this;
-    }
-    
-    public ResearchItem setEntityTriggers(String... par)
-    {
-        this.entityTriggers = par;
-        return this;
-    }
-    
-    public ResearchItem setAspectTriggers(Aspect... par)
-    {
-        this.aspectTriggers = par;
-        return this;
-    }
-
-    public ItemStack[] getItemTriggers() {
-		return itemTriggers;
-	}
-
-	public String[] getEntityTriggers() {
-		return entityTriggers;
-	}
-	
-	public Aspect[] getAspectTriggers() {
-		return aspectTriggers;
-	}
-
-	public ResearchItem registerResearchItem()
-    {
-        ResearchCategories.addResearch(this);
-        return this;
-    }
-
-    public String getName()
-    {
-    	return StatCollector.translateToLocal("tc.research_name."+key);
-    }
-    
-    public String getText()
-    {
-    	return StatCollector.translateToLocal("tc.research_text."+key);
-    }
-
-    public boolean isSpecial()
-    {
-        return this.isSpecial;
-    }
-    
-    public boolean isStub()
-    {
-        return this.isStub;
-    }
-        
-    public boolean isLost()
-    {
-        return this.isLost;
-    }
-    
-    public boolean isConcealed()
-    {
-        return this.isConcealed;
-    }
-    
-    public boolean isHidden()
-    {
-        return this.isHidden;
-    }
-    
-    public boolean isVirtual()
-    {
-        return this.isVirtual;
-    }
-    
-    public boolean isAutoUnlock() {
-		return isAutoUnlock;
-	}
-	
-	public ResearchItem setAutoUnlock()
-    {
-        this.isAutoUnlock = true;
-        return this;
-    }
-	
-	public boolean isRound() {
-		return isRound;
-	}
-
-	public ResearchItem setRound() {
-		this.isRound = true;
-		return this;
-	}
-	
-	public boolean isSecondary() {
-		return isSecondary;
-	}
-
-	public ResearchItem setSecondary() {
-		this.isSecondary = true;
-		return this;
-	}
-
-	public int getComplexity() {
-		return complexity;
-	}
-
-	public ResearchItem setComplexity(int complexity) {
-		this.complexity = complexity;
-		return this;
-	}
-
-	/**
-	 * @return the aspect aspects ordinal with the highest value. Used to determine scroll color and similar things
-	 */
-	public Aspect getResearchPrimaryTag() {
-		Aspect aspect=null;
-		int highest=0;
-		if (tags!=null)
-		for (Aspect tag:tags.getAspects()) {
-			if (tags.getAmount(tag)>highest) {
-				aspect=tag;
-				highest=tags.getAmount(tag);
-			};
-		}
-		return aspect;
-	}
-	
-}
@@ -1,193 +0,0 @@
-package thaumcraft.api.research;
-
-import java.util.List;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.FurnaceRecipes;
-import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.StatCollector;
-import thaumcraft.api.aspects.AspectList;
-import thaumcraft.api.crafting.CrucibleRecipe;
-import thaumcraft.api.crafting.IArcaneRecipe;
-import thaumcraft.api.crafting.InfusionEnchantmentRecipe;
-import thaumcraft.api.crafting.InfusionRecipe;
-
-public class ResearchPage {
-	public static enum PageType
-    {
-        TEXT,
-        TEXT_CONCEALED,
-        IMAGE,
-        CRUCIBLE_CRAFTING,
-        ARCANE_CRAFTING,
-        ASPECTS,
-        NORMAL_CRAFTING,
-        INFUSION_CRAFTING,
-        COMPOUND_CRAFTING,
-        INFUSION_ENCHANTMENT,
-        SMELTING
-    }
-	
-	public PageType type = PageType.TEXT;
-	
-	public String text=null;
-	public String research=null;
-	public ResourceLocation image=null;
-	public AspectList aspects=null;
-	public Object recipe=null;
-	public ItemStack recipeOutput=null;
-	
-	/**
-	 * @param text this can (but does not have to) be a reference to a localization variable, not the actual text.
-	 */
-	public ResearchPage(String text) {
-		this.type = PageType.TEXT;
-		this.text = text;
-	}
-	
-	/**
-	 * @param research this page will only be displayed if the player has discovered this research
-	 * @param text this can (but does not have to) be a reference to a localization variable, not the actual text.
-	 */
-	public ResearchPage(String research, String text) {
-		this.type = PageType.TEXT_CONCEALED;
-		this.research = research;
-		this.text = text;
-	}
-	
-	/**
-	 * @param recipe a vanilla crafting recipe.
-	 */
-	public ResearchPage(IRecipe recipe) {
-		this.type = PageType.NORMAL_CRAFTING;
-		this.recipe = recipe;
-		this.recipeOutput = recipe.getRecipeOutput();
-	}
-	
-	/**
-	 * @param recipe a collection of vanilla crafting recipes.
-	 */
-	public ResearchPage(IRecipe[] recipe) {
-		this.type = PageType.NORMAL_CRAFTING;
-		this.recipe = recipe;
-	}
-	
-	/**
-	 * @param recipe a collection of arcane crafting recipes.
-	 */
-	public ResearchPage(IArcaneRecipe[] recipe) {
-		this.type = PageType.ARCANE_CRAFTING;
-		this.recipe = recipe;
-	}
-	
-	/**
-	 * @param recipe a collection of arcane crafting recipes.
-	 */
-	public ResearchPage(CrucibleRecipe[] recipe) {
-		this.type = PageType.CRUCIBLE_CRAFTING;
-		this.recipe = recipe;
-	}
-	
-	/**
-	 * @param recipe a collection of infusion crafting recipes.
-	 */
-	public ResearchPage(InfusionRecipe[] recipe) {
-		this.type = PageType.INFUSION_CRAFTING;
-		this.recipe = recipe;
-	}
-	
-	/**
-	 * @param recipe a compound crafting recipe.
-	 */
-	public ResearchPage(List recipe) {
-		this.type = PageType.COMPOUND_CRAFTING;
-		this.recipe = recipe;
-	}
-	
-	/**
-	 * @param recipe an arcane worktable crafting recipe.
-	 */
-	public ResearchPage(IArcaneRecipe recipe) {
-		this.type = PageType.ARCANE_CRAFTING;
-		this.recipe = recipe;
-		this.recipeOutput = recipe.getRecipeOutput();
-	}
-	
-	/**
-	 * @param recipe an alchemy crafting recipe.
-	 */
-	public ResearchPage(CrucibleRecipe recipe) {
-		this.type = PageType.CRUCIBLE_CRAFTING;
-		this.recipe = recipe;
-		this.recipeOutput = recipe.getRecipeOutput();
-	}
-	
-	/**
-	 * @param recipe a furnace smelting crafting recipe.
-	 */
-	public ResearchPage(ItemStack input) {
-		this.type = PageType.SMELTING;
-		this.recipe = input;
-		this.recipeOutput = FurnaceRecipes.smelting().getSmeltingResult(input);
-	}
-	
-	/**
-	 * @param recipe an infusion crafting recipe.
-	 */
-	public ResearchPage(InfusionRecipe recipe) {
-		this.type = PageType.INFUSION_CRAFTING;
-		this.recipe = recipe;
-		if (recipe.getRecipeOutput() instanceof ItemStack) {
-			this.recipeOutput = (ItemStack) recipe.getRecipeOutput();
-		} else {
-			this.recipeOutput = recipe.getRecipeInput();
-		}
-	}
-	
-	/**
-	 * @param recipe an infusion crafting recipe.
-	 */
-	public ResearchPage(InfusionEnchantmentRecipe recipe) {
-		this.type = PageType.INFUSION_ENCHANTMENT;
-		this.recipe = recipe;
-//		if (recipe.recipeOutput instanceof ItemStack) {
-//			this.recipeOutput = (ItemStack) recipe.recipeOutput;
-//		} else {
-//			this.recipeOutput = recipe.recipeInput;
-//		}
-	}
-	
-	/**
-	 * @param image
-	 * @param caption this can (but does not have to) be a reference to a localization variable, not the actual text.
-	 */
-	public ResearchPage(ResourceLocation image, String caption) {
-		this.type = PageType.IMAGE;
-		this.image = image;
-		this.text = caption;
-	}
-	
-	/**
-	 * This function should really not be called directly - used internally
-	 */
-	public ResearchPage(AspectList as) {
-		this.type = PageType.ASPECTS;
-		this.aspects = as;
-	}
-	
-	/**
-	 * returns a localized text of the text field (if one exists). Returns the text field itself otherwise.
-	 * @return
-	 */
-	public String getTranslatedText() {
-		String ret="";
-		if (text != null) {
-			ret = StatCollector.translateToLocal(text);
-			if (ret.isEmpty()) ret = text;
-		}
-		return ret;
-	}
-	
-	
-}
@@ -1,16 +0,0 @@
-package thaumcraft.api.wands;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-
-/**
- * 
- * @author azanor
- * 
- * Implemented by a class that you wish to be called whenever a wand with this rod performs its
- * update tick. 
- *
- */
-public interface IWandRodOnUpdate {
-	void onUpdate(ItemStack itemstack, EntityPlayer player);
-}
@@ -1,48 +0,0 @@
-package thaumcraft.api.wands;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-
-/**
- * 
- * @author Azanor
- * 
- * This class is used to keep the material information for the various rods. 
- * It is also used to generate the wand recipes ingame.
- *
- */
-public class StaffRod extends WandRod {
-	
-	boolean runes=false;
-
-	public StaffRod(String tag, int capacity, ItemStack item, int craftCost) {
-		super(tag+"_staff", capacity, item, craftCost);
-		this.texture = new ResourceLocation("thaumcraft","textures/models/wand_rod_"+tag+".png");
-	}
-
-	public StaffRod(String tag, int capacity, ItemStack item, int craftCost,
-			IWandRodOnUpdate onUpdate, ResourceLocation texture) {
-		super(tag+"_staff", capacity, item, craftCost, onUpdate, texture);
-	}
-
-	public StaffRod(String tag, int capacity, ItemStack item, int craftCost,
-			IWandRodOnUpdate onUpdate) {
-		super(tag+"_staff", capacity, item, craftCost, onUpdate);
-		this.texture = new ResourceLocation("thaumcraft","textures/models/wand_rod_"+tag+".png");
-	}
-
-	public StaffRod(String tag, int capacity, ItemStack item, int craftCost,
-			ResourceLocation texture) {
-		super(tag+"_staff", capacity, item, craftCost, texture);
-	}
-
-	public boolean hasRunes() {
-		return runes;
-	}
-
-	public void setRunes(boolean hasRunes) {
-		this.runes = hasRunes;
-	}
-
-	
-}
@@ -1,129 +0,0 @@
-package thaumcraft.api.wands;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-import thaumcraft.api.aspects.Aspect;
-
-/**
- * This class is used to keep the material information for the various caps. 
- * It is also used to generate the wand recipes ingame.
- * @author Azanor
- *
- */
-public class WandCap {
-
-	private String tag;
-	
-	/**
-	 * Cost to craft this wand. Combined with the rod cost.
-	 */
-	private int craftCost;
-	
-	/**
-	 * the amount by which all aspect costs are multiplied
-	 */
-	float baseCostModifier; 
-	
-	/**
-	 * specifies a list of primal aspects that use the special discount figure instead of the normal discount.
-	 */
-	List<Aspect> specialCostModifierAspects;
-	
-	/**
-	 * the amount by which the specified aspect costs are multiplied
-	 */
-	float specialCostModifier;
-	
-	/**
-	 * The texture that will be used for the ingame wand cap
-	 */
-	ResourceLocation texture;
-	
-	/**
-	 * the actual item that makes up this cap and will be used to generate the wand recipes
-	 */
-	ItemStack item;
-	
-	public static LinkedHashMap<String,WandCap> caps = new LinkedHashMap<String,WandCap>();
-
-	public WandCap (String tag, float discount, ItemStack item, int craftCost) {
-		this.setTag(tag);
-		this.baseCostModifier = discount;
-		this.specialCostModifierAspects = null;
-		texture = new ResourceLocation("thaumcraft","textures/models/wand_cap_"+getTag()+".png");
-		this.item=item;
-		this.setCraftCost(craftCost);
-		caps.put(tag, this);
-	}
-	
-	public WandCap (String tag, float discount, List<Aspect> specialAspects, float discountSpecial, ItemStack item, int craftCost) {
-		this.setTag(tag);
-		this.baseCostModifier = discount;
-		this.specialCostModifierAspects = specialAspects;
-		this.specialCostModifier = discountSpecial;
-		texture = new ResourceLocation("thaumcraft","textures/models/wand_cap_"+getTag()+".png");
-		this.item=item;
-		this.setCraftCost(craftCost);
-		caps.put(tag, this);
-	}
-	
-	public float getBaseCostModifier() {
-		return baseCostModifier;
-	}
-
-	public List<Aspect> getSpecialCostModifierAspects() {
-		return specialCostModifierAspects;
-	}
-
-	public float getSpecialCostModifier() {
-		return specialCostModifier;
-	}
-
-	public ResourceLocation getTexture() {
-		return texture;
-	}
-
-	public void setTexture(ResourceLocation texture) {
-		this.texture = texture;
-	}
-
-	public String getTag() {
-		return tag;
-	}
-
-	public void setTag(String tag) {
-		this.tag = tag;
-	}
-	
-
-	public ItemStack getItem() {
-		return item;
-	}
-
-	public void setItem(ItemStack item) {
-		this.item = item;
-	}
-
-	public int getCraftCost() {
-		return craftCost;
-	}
-
-	public void setCraftCost(int craftCost) {
-		this.craftCost = craftCost;
-	}
-	
-	/**
-	 * The research a player needs to have finished to be able to craft a wand with this cap. 
-	 */
-	public String getResearch() {
-		return "CAP_"+getTag();
-	}
-	
-	//  Some examples:
-	//  WandCap WAND_CAP_IRON = new WandCap("iron", 1.1f, Arrays.asList(Aspect.ORDER),1, new ItemStack(ConfigItems.itemWandCap,1,0),1);
-	//  WandCap WAND_CAP_GOLD = new WandCap("gold", 1f, new ItemStack(ConfigItems.itemWandCap,1,1),3);
-	
-}
@@ -1,158 +0,0 @@
-package thaumcraft.api.wands;
-
-import java.util.LinkedHashMap;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-
-/**
- * 
- * @author Azanor
- * 
- * This class is used to keep the material information for the various rods. 
- * It is also used to generate the wand recipes ingame.
- *
- */
-public class WandRod {
-
-	
-	private String tag;
-	
-	/**
-	 * Cost to craft this wand. Combined with the rod cost.
-	 */
-	private int craftCost;
-	
-	/** 
-	 * The amount of vis that can be stored - this number is actually multiplied 
-	 * by 100 for use by the wands internals
-	 */
-	int capacity;   
-
-	/**
-	 * The texture that will be used for the ingame wand rod
-	 */
-	protected ResourceLocation texture;
-	
-	/**
-	 * the actual item that makes up this rod and will be used to generate the wand recipes
-	 */
-	ItemStack item;
-	
-	/**
-	 * A class that will be called whenever the wand onUpdate tick is run
-	 */
-	IWandRodOnUpdate onUpdate;
-	
-	/**
-	 * Does the rod glow in the dark?
-	 */
-	boolean glow;
-
-	public static LinkedHashMap<String,WandRod> rods = new LinkedHashMap<String,WandRod>();
-	
-	public WandRod (String tag, int capacity, ItemStack item, int craftCost, ResourceLocation texture) {
-		this.setTag(tag);
-		this.capacity = capacity;
-		this.texture = texture;
-		this.item=item;
-		this.setCraftCost(craftCost);
-		rods.put(tag, this);
-	}
-	
-	public WandRod (String tag, int capacity, ItemStack item, int craftCost, IWandRodOnUpdate onUpdate, ResourceLocation texture) {
-		this.setTag(tag);
-		this.capacity = capacity;
-		this.texture = texture;
-		this.item=item;
-		this.setCraftCost(craftCost);
-		rods.put(tag, this);
-		this.onUpdate = onUpdate;
-	}
-
-	public WandRod (String tag, int capacity, ItemStack item, int craftCost) {
-		this.setTag(tag);
-		this.capacity = capacity;
-		this.texture = new ResourceLocation("thaumcraft","textures/models/wand_rod_"+getTag()+".png");
-		this.item=item;
-		this.setCraftCost(craftCost);
-		rods.put(tag, this);
-	}
-	
-	public WandRod (String tag, int capacity, ItemStack item, int craftCost, IWandRodOnUpdate onUpdate) {
-		this.setTag(tag);
-		this.capacity = capacity;
-		this.texture = new ResourceLocation("thaumcraft","textures/models/wand_rod_"+getTag()+".png");
-		this.item=item;
-		this.setCraftCost(craftCost);
-		rods.put(tag, this);
-		this.onUpdate = onUpdate;
-	}
-	
-	public String getTag() {
-		return tag;
-	}
-	
-	public void setTag(String tag) {
-		this.tag = tag;
-	}
-
-	public int getCapacity() {
-		return capacity;
-	}
-
-	public void setCapacity(int capacity) {
-		this.capacity = capacity;
-	}
-
-	public ResourceLocation getTexture() {
-		return texture;
-	}
-
-	public void setTexture(ResourceLocation texture) {
-		this.texture = texture;
-	}
-
-	public ItemStack getItem() {
-		return item;
-	}
-
-	public void setItem(ItemStack item) {
-		this.item = item;
-	}
-	
-	public int getCraftCost() {
-		return craftCost;
-	}
-
-	public void setCraftCost(int craftCost) {
-		this.craftCost = craftCost;
-	}
-
-	public IWandRodOnUpdate getOnUpdate() {
-		return onUpdate;
-	}
-
-	public void setOnUpdate(IWandRodOnUpdate onUpdate) {
-		this.onUpdate = onUpdate;
-	}
-
-	public boolean isGlowing() {
-		return glow;
-	}
-
-	public void setGlowing(boolean hasGlow) {
-		this.glow = hasGlow;
-	}
-	
-	/**
-	 * The research a player needs to have finished to be able to craft a wand with this rod. 
-	 */
-	public String getResearch() {
-		return "ROD_"+getTag();
-	}
-
-	//  Some examples:
-	//	WandRod WAND_ROD_WOOD = new WandRod("wood",25,new ItemStack(Item.stick),1);
-	//	WandRod WAND_ROD_BLAZE = new WandRod("blaze",100,new ItemStack(Item.blazeRod),7,new WandRodBlazeOnUpdate());
-}
@@ -31,11 +31,11 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.Calendar;

-@Mod(modid = BloodArsenal.MODID, version = BloodArsenal.VERSION, name = "Blood Arsenal", dependencies = "required-after:AWWayofTime;after:NotEnoughItems;after:Baubles;after:guideapi;after:TConstruct;after:Waila;after:ForbiddenMagic", guiFactory = "com.arc.bloodarsenal.common.gui.ConfigGuiFactory")
+@Mod(modid = BloodArsenal.MODID, version = BloodArsenal.VERSION, name = "GRADLETOKEN_MODNAME", dependencies = "required-after:AWWayofTime;after:NotEnoughItems;after:Baubles;after:guideapi;after:TConstruct;after:Waila;after:ForbiddenMagic", guiFactory = "com.arc.bloodarsenal.common.gui.ConfigGuiFactory")
 public class BloodArsenal
 {
-    public final static String MODID = "BloodArsenal";
-    public final static String VERSION = "@VERSION@";
+    public final static String MODID = "GRADLETOKEN_MODID";
+    public final static String VERSION = "GRADLETOKEN_VERSION";

    @SidedProxy(clientSide = "com.arc.bloodarsenal.client.ClientProxy", serverSide = "com.arc.bloodarsenal.common.CommonProxy")
    public static CommonProxy proxy;
@@ -1,11 +1,11 @@
 [
 {
-  "modid": "BloodArsenal",
-  "name": "Blood Arsenal",
+  "modid": "${modId}",
+  "name": "{$modName}",
  "description": "Blood-themed tools, weapons, armor and much more!",
-  "version": "1.2-4",
-  "mcversion": "1.7.10",
-  "url": "",
+  "version": "${modVersion}",
+  "mcversion": "${minecraftVersion}",
+  "url": "https://github.com/GTNewHorizons/BloodArsenal",
  "updateUrl": "",
  "authors": ["Arcratus"],
  "credits": "WayofTime, TehNut, Vazkii, SpitefulFox",
@@ -1 +0,0 @@
-1.2-5