Buildscript (#27)

* Cleanup buildscript

.github/scripts/test-no-crash-reports.sh

@@ -0,0 +1,9 @@
+directory="run/crash-reports"
+if [ -d $directory ]; then
+  echo "Crash reports detected:"
+  cat $directory/*
+  exit 1
+else
+  echo "No crash reports detected"
+  exit 0
+fi

.github/workflows/build-and-test.yml

@@ -0,0 +1,45 @@
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Build and test
+
+on:
+  pull_request:
+    branches: [ master, main ]
+  push:
+    branches: [ master, main ]
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with: 
+        fetch-depth: 0
+    
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: '8'
+        distribution: 'adopt'
+        cache: gradle
+        
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+
+    - name: Setup the workspace
+      run: ./gradlew setupCIWorkspace
+    
+    - name: Build the mod
+      run: ./gradlew build
+
+    - name: Run server for 1 minute
+      run: |
+        mkdir run
+        echo "eula=true" > run/eula.txt  
+        timeout 10 ./gradlew runServer || true
+
+    - name: Test no crashes happend
+      run: |
+        chmod +x .github/scripts/test-no-crash-reports.sh
+        .github/scripts/test-no-crash-reports.sh

.github/workflows/release-tags.yml

@@ -0,0 +1,45 @@
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Release tagged build
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set release version
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+
+      - name: Set up JDK 8
+        uses: actions/setup-java@v2
+        with:
+          java-version: '8'
+          distribution: 'adopt'
+          cache: gradle
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Setup the workspace
+        run: ./gradlew setupCIWorkspace
+
+      - name: Build the mod
+        run: ./gradlew build
+
+      - name: Release under current tag
+        uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "${{ env.RELEASE_VERSION }}"
+          prerelease: false
+          title: "${{ env.RELEASE_VERSION }}"
+          files: build/libs/*.jar

.gitignore

@@ -11,12 +11,12 @@
 /bin/*
 /download/*
 /.settings/*
-/eclipse/*
 /debug/*
 /.metadata/*
 /config/*
 /logs/*
 /saves/*
+/.idea/
 
 #File Extensions
 *.psd

README.md

@@ -4,11 +4,11 @@
 
 Electro-Magic Tools is a Minecraft mod which integrates Thaumcraft 4 with IndustrialCraft 2 by adding cross-mod tools and items, such as magic solar panels, essentia generators and legendary items.
 
-#Downloads
 
-[CurseForge downloads](http://minecraft.curseforge.com/projects/electro-magic-tools)
-
-[Github Releases](https://github.com/fewizz/Electro-Magic-Tools/releases)
+# 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
 
 #Issues
 
@@ -22,7 +22,6 @@ Before posting to the issue tracker, make sure you meet the following criteria:
 - You speak English or Russian well enough to explain yourself without wondering whether you will be understood. 
 
 
-# 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
+#Upstream
+
+[CurseForge](http://minecraft.curseforge.com/projects/electro-magic-tools)

build.gradle

@@ -1,87 +1,588 @@
+//version: 1641429628
+/*
+DO NOT CHANGE THIS FILE!
+
+Also, you may replace this file at any time if there is an update available.
+Please check https://github.com/SinTh0r4s/ExampleMod1.7.10/blob/main/build.gradle for updates.
+ */
+
+
+import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+import java.util.concurrent.TimeUnit
+
 buildscript {
     repositories {
-        mavenCentral()
-        maven { url = "http://files.minecraftforge.net/maven" }
+        maven {
+            name = "forge"
+            url = "https://maven.minecraftforge.net"
+        }
+        maven {
+            name = "sonatype"
+            url = "https://oss.sonatype.org/content/repositories/snapshots/"
+        }
+        maven {
+            name = "Scala CI dependencies"
+            url = "https://repo1.maven.org/maven2/"
+        }
+        maven {
+            name = "jitpack"
+            url = "https://jitpack.io"
+        }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+        classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.5'
     }
 }
 
+plugins {
+    id 'idea'
+    id 'scala'
+    id("org.ajoberstar.grgit") version("3.1.1")
+    id("com.github.johnrengelman.shadow") version("4.0.4")
+    id("com.palantir.git-version") version("0.12.3")
+    id("maven-publish")
+}
+
 apply plugin: 'forge'
-apply plugin: 'signing'
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+def projectJavaVersion = JavaLanguageVersion.of(8)
 
-ext.configFile = file "build.properties"
-configFile.withReader {
-    def prop = new Properties()
-    prop.load(it)
-    project.ext.config = new ConfigSlurper().parse prop
+java {
+    toolchain {
+        languageVersion.set(projectJavaVersion)
+    }
 }
 
-version = config.mod_version + "[" + config.mc_version + "]"
-group= config.package_group
-archivesBaseName = config.mod_name
+idea {
+    module {
+        inheritOutputDirs = true
+        downloadJavadoc = true
+        downloadSources = true
+    }
+}
+
+if(JavaVersion.current() != JavaVersion.VERSION_1_8) {
+    throw new GradleException("This project requires Java 8, but it's running on " + JavaVersion.current())
+}
+
+checkPropertyExists("modName")
+checkPropertyExists("modId")
+checkPropertyExists("modGroup")
+checkPropertyExists("autoUpdateBuildScript")
+checkPropertyExists("minecraftVersion")
+checkPropertyExists("forgeVersion")
+checkPropertyExists("replaceGradleTokenInFile")
+checkPropertyExists("gradleTokenModId")
+checkPropertyExists("gradleTokenModName")
+checkPropertyExists("gradleTokenVersion")
+checkPropertyExists("gradleTokenGroupName")
+checkPropertyExists("apiPackage")
+checkPropertyExists("accessTransformersFile")
+checkPropertyExists("usesMixins")
+checkPropertyExists("mixinPlugin")
+checkPropertyExists("mixinsPackage")
+checkPropertyExists("coreModClass")
+checkPropertyExists("containsMixinsAndOrCoreModOnly")
+checkPropertyExists("usesShadowedDependencies")
+checkPropertyExists("developmentEnvironmentUserName")
+
+
+String javaSourceDir = "src/main/java/"
+String scalaSourceDir = "src/main/scala/"
+
+String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/")
+String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/")
+if((getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists()) == false) {
+    throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
+}
+
+if(apiPackage) {
+    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
+    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
+    if((getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists()) == false) {
+        throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
+    }
+}
+
+if(accessTransformersFile) {
+    String targetFile = "src/main/resources/META-INF/" + accessTransformersFile
+    if(getFile(targetFile).exists() == false) {
+        throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
+    }
+}
+
+if(usesMixins.toBoolean()) {
+    if(mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) {
+        throw new GradleException("\"mixinPlugin\" requires \"mixinsPackage\" and \"mixinPlugin\" to be set!")
+    }
+
+    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
+    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
+    if((getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists()) == false) {
+        throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
+    }
+
+    String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
+    String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".scala"
+    String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
+    if((getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists()) == false) {
+        throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava)
+    }
+}
+
+if(coreModClass) {
+    String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
+    String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".scala"
+    String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
+    if((getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists()) == false) {
+        throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava)
+    }
+}
+
+configurations.all {
+    resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS)
+
+    // Make sure GregTech build won't time out
+    System.setProperty("org.gradle.internal.http.connectionTimeout", 120000 as String)
+    System.setProperty("org.gradle.internal.http.socketTimeout", 120000 as String)
+}
+
+// Fix Jenkins' Git: chmod a file should not be detected as a change and append a '.dirty' to the version
+'git config core.fileMode false'.execute()
+// Pulls version from git tag
+try {
+    version = minecraftVersion + "-" + gitVersion()
+}
+catch (Exception e) {
+    throw new IllegalStateException("This mod must be version controlled by Git AND the repository must provide at least one tag!");
+}
+
+group = modGroup
+if(project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
+    archivesBaseName = customArchiveBaseName
+}
+else {
+    archivesBaseName = modId
+}
 
 minecraft {
-    version = config.mc_version + "-" + config.forge_version + "-" + config.mc_version
+    version = minecraftVersion + "-" + forgeVersion + "-" + minecraftVersion
     runDir = "run"
-	replaceIn "EMT.java"
-    replace "@version@", config.mod_version
-	
-    if (project.hasProperty('mappings_version'))
-        mappings = project.mappings_version
+
+    if (replaceGradleTokenInFile) {
+        replaceIn replaceGradleTokenInFile
+        if(gradleTokenModId) {
+            replace gradleTokenModId, modId
+        }
+        if(gradleTokenModName) {
+            replace gradleTokenModName, modName
+        }
+        if(gradleTokenVersion) {
+            replace gradleTokenVersion, versionDetails().lastTag
+        }
+        if(gradleTokenGroupName) {
+            replace gradleTokenGroupName, modGroup
+        }
+    }
 }
 
-processResources {
-    inputs.property "version", project.version
-    inputs.property "mcversion", project.minecraft.version
+if(file("addon.gradle").exists()) {
+    apply from: "addon.gradle"
+}
 
-    from(sourceSets.main.resources.srcDirs) {
-        include '**/*.info'
-        expand 'version': config.mod_version
+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 {
+    if(usesMixins.toBoolean()) {
+        annotationProcessor("org.ow2.asm:asm-debug-all:5.0.3")
+        annotationProcessor("com.google.guava:guava:24.1.1-jre")
+        annotationProcessor("com.google.code.gson:gson:2.8.6")
+        annotationProcessor("org.spongepowered:mixin:0.8-SNAPSHOT")
+        // using 0.8 to workaround a issue in 0.7 which fails mixin application
+        compile("org.spongepowered:mixin:0.7.11-SNAPSHOT") {
+            // Mixin includes a lot of dependencies that are too up-to-date
+            exclude module: "launchwrapper"
+            exclude module: "guava"
+            exclude module: "gson"
+            exclude module: "commons-io"
+            exclude module: "log4j-core"
+        }
+        compile("com.github.GTNewHorizons:SpongeMixins:1.3.3:dev")
+    }
+}
+
+apply from: 'dependencies.gradle'
+
+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 {
-	exclude "baubles/**"
-	exclude "ic2/**"
-	exclude "thaumcraft/**"
-}
-
-// add a source jar
-task sourceJar(type: Jar) {
-    from sourceSets.main.allSource
-    classifier = 'sources'
-}
-
-// because the normal output has been made to be obfuscated
-task deobfJar(type: Jar) {
-    from sourceSets.main.output
-    classifier = 'deobf'
-}
-
-tasks.build.dependsOn sourceJar, deobfJar
-
-tasks.withType(JavaCompile) { task ->
-    task.options.encoding = 'UTF-8'
-}
-
-task signJar(dependsOn: 'reobf'){
-    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
-            )
+    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 {
+    def arguments = []
+
+    if(usesMixins.toBoolean()) {
+        arguments += [
+                "--mods=../build/libs/$modId-${version}.jar",
+                "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
+        ]
+    }
+
+    if(developmentEnvironmentUserName) {
+        arguments += [
+                "--username",
+                developmentEnvironmentUserName
+        ]
+    }
+
+    args(arguments)
+}
+
+runServer {
+    def arguments = []
+
+    if (usesMixins.toBoolean()) {
+        arguments += [
+                "--mods=../build/libs/$modId-${version}.jar",
+                "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
+        ]
+    }
+
+    args(arguments)
+}
+
+tasks.withType(JavaExec).configureEach {
+    javaLauncher.set(
+            javaToolchains.launcherFor {
+                languageVersion = projectJavaVersion
+            }
+    )
+}
+
+processResources
+{
+    // this will ensure that this task is redone when the versions change.
+    inputs.property "version", project.version
+    inputs.property "mcversion", project.minecraft.version
+
+    // replace stuff in mcmod.info, nothing else
+    from(sourceSets.main.resources.srcDirs) {
+        include 'mcmod.info'
+
+        // replace version and mcversion
+        expand "minecraftVersion": project.minecraft.version,
+                "modVersion": versionDetails().lastTag,
+                "modId": modId,
+                "modName": modName
+    }
+
+    if(usesMixins.toBoolean()) {
+        from refMap
+    }
+
+    // copy everything else, thats not the mcmod.info
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
+    }
+}
+
+def getManifestAttributes() {
+    def manifestAttributes = [:]
+    if(containsMixinsAndOrCoreModOnly.toBoolean() == false && (usesMixins.toBoolean() || coreModClass)) {
+        manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
+    }
+
+    if(accessTransformersFile) {
+        manifestAttributes += ["FMLAT" : accessTransformersFile.toString()]
+    }
+
+    if(coreModClass) {
+        manifestAttributes += ["FMLCorePlugin": modGroup + "." + coreModClass]
+    }
+
+    if(usesMixins.toBoolean()) {
+        manifestAttributes += [
+                "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
+                "MixinConfigs" : "mixins." + modId + ".json",
+                "ForceLoadAsMod" : containsMixinsAndOrCoreModOnly.toBoolean() == false
+        ]
+    }
+    return manifestAttributes
+}
+
+task sourcesJar(type: Jar) {
+    from (sourceSets.main.allJava)
+    from (file("$projectDir/LICENSE"))
+    getArchiveClassifier().set('sources')
+}
+
+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 {
+    archives sourcesJar
+    archives devJar
+    if(apiPackage) {
+        archives apiJar
+    }
+}
+
+// publishing
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifact source: jar
+            artifact source: sourcesJar, classifier: "src"
+            artifact source: devJar, classifier: "dev"
+            if (apiPackage) {
+                artifact source: apiJar, classifier: "api"
+            }
+
+            groupId = System.getenv("ARTIFACT_GROUP_ID") ?: group
+            artifactId = System.getenv("ARTIFACT_ID") ?: project.name
+            version = System.getenv("ARTIFACT_VERSION") ?: project.version
+        }
+    }
+    
+    repositories {
+        maven {
+            String owner = System.getenv("REPOSITORY_OWNER") ?: "Unknown"
+            String repositoryName = System.getenv("REPOSITORY_NAME") ?: "Unknown"
+            String githubRepositoryUrl = "https://maven.pkg.github.com/$owner/$repositoryName"
+            name = "GitHubPackages"
+            url = githubRepositoryUrl
+            credentials {
+                username = System.getenv("GITHUB_ACTOR") ?: "NONE"
+                password = System.getenv("GITHUB_TOKEN") ?: "NONE"
+            }
+        }
+    }
+}
+
+// Updating
+task updateBuildScript {
+    doLast {
+        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/SinTh0r4s/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'
+}
+
+// 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/SinTh0r4s/ExampleMod1.7.10/blob/main/gradle.properties")
+    }
+}
+
+def getFile(String relativePath) {
+    return new File(projectDir, relativePath)
+}

dependencies.gradle

@@ -0,0 +1,18 @@
+// Add your dependencies here
+
+dependencies {
+    compile("com.github.GTNewHorizons:GT5-Unofficial:master-SNAPSHOT:dev")
+    compile("com.github.GTNewHorizons:CodeChickenLib:master-SNAPSHOT:dev")
+    compile("com.github.GTNewHorizons:CodeChickenCore:master-SNAPSHOT:dev")
+    compile("com.github.GTNewHorizons:StructureLib:master-SNAPSHOT:dev")
+    compile("com.github.GTNewHorizons:NotEnoughItems:master-SNAPSHOT:dev")
+    compile("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
+    
+    compileOnly("com.github.GTNewHorizons:Galacticraft:master-SNAPSHOT:dev") {
+        transitive = false
+    }
+    compileOnly("com.github.GTNewHorizons:Baubles:master-SNAPSHOT:dev") {
+        transitive = false
+    }
+
+}

gradle.properties

@@ -1,2 +1,64 @@
-org.gradle.debug=false
-org.gradle.daemon=false
+modName = Electro-Magic Tools
+
+# This is a case-sensitive string to identify your mod. Convention is to use lower case.
+modId = EMT
+
+modGroup = emt
+
+# WHY is there no version field?
+# The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the
+# code base or your binary. Check out this tutorial: https://blog.mattclemente.com/2017/10/13/versioning-with-git-tags/
+
+# Will update your build.gradle automatically whenever an update is available
+autoUpdateBuildScript = false
+
+minecraftVersion = 1.7.10
+forgeVersion = 10.13.4.1614
+
+# Select a username for testing your mod with breakpoints. You may leave this empty for a random user name each time you
+# restart Minecraft in development. Choose this dependent on your mod:
+# Do you need consistent player progressing (for example Thaumcraft)? -> Select a name
+# Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
+developmentEnvironmentUserName = Developer
+
+# Define a source file of your project with:
+# public static final String VERSION = "GRADLETOKEN_VERSION";
+# The string's content will be replaced with your mods version when compiled. You should use this to specify your mod's
+# version in @Mod([...], version = VERSION, [...])
+# Leave these properties empty to skip individual token replacements
+replaceGradleTokenInFile = EMT.java
+gradleTokenModId = GRADLETOKEN_MODID
+gradleTokenModName = GRADLETOKEN_MODNAME
+gradleTokenVersion = GRADLETOKEN_VERSION
+gradleTokenGroupName = GRADLETOKEN_GROUPNAME
+
+# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
+# leave this property empty.
+# Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
+apiPackage =
+
+# Specify the configuration file for Forge's access transformers here. I must be placed into /src/main/resources/META-INF/
+# Example value: mymodid_at.cfg
+accessTransformersFile =
+
+# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
+usesMixins = false
+# Specify the location of your implementation of 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 =

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sat Jan 04 01:56:22 CET 2020
 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-bin.zip

gradlew

@@ -1,4 +1,20 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
 ##
@@ -6,47 +22,6 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -61,9 +36,49 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -90,7 +105,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -110,10 +125,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +170,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -8,14 +24,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +62,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +75,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

repositories.gradle

@@ -0,0 +1,20 @@
+// Add any additional repositiroes for your dependencies here
+
+repositories {
+    mavenCentral()
+    maven {
+        name = "ic2"
+        url = "https://maven.ic2.player.to/"
+        metadataSources {
+            mavenPom()
+            artifact()
+        }
+    }
+    maven {
+        url "https://cursemaven.com"
+    }
+
+    maven {
+        url = "https://jitpack.io"
+    }
+}

src/main/java/api/java/baubles/api/BaubleType.java

@@ -1,7 +0,0 @@
-package baubles.api;
-
-public enum BaubleType {
-    RING,
-    AMULET,
-    BELT
-}

src/main/java/api/java/baubles/api/BaublesApi.java

@@ -1,35 +0,0 @@
-package baubles.api;
-
-import cpw.mods.fml.common.FMLLog;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.IInventory;
-
-import java.lang.reflect.Method;
-
-/**
- * @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;
-    }
-
-}

src/main/java/api/java/baubles/api/IBauble.java

@@ -1,44 +0,0 @@
-package baubles.api;
-
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.item.ItemStack;
-
-/**
- * @author Azanor
- *         <p/>
- *         This interface should be extended by items that can be worn in bauble slots
- */
-
-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);
-}

src/main/java/api/java/baubles/api/package-info.java

@@ -1,3 +0,0 @@
-@API(apiVersion = "1.7.10-1.0.1.5", owner = "Baubles", provides = "Baubles|API") package baubles.api;
-
-import cpw.mods.fml.common.API;

src/main/java/api/java/ic2/api/Direction.java

@@ -1,135 +0,0 @@
-package ic2.api;
-
-import java.util.EnumSet;
-import java.util.Set;
-
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-
-import net.minecraftforge.common.util.ForgeDirection;
-
-/**
- * Represents the 6 possible directions along the axis of a block.
- */
-public enum Direction {
-	/**
-	 * -X
-	 */
-	XN,
-	/**
-	 * +X
-	 */
-	XP,
-
-	/**
-	 * -Y
-	 */
-	YN, //MC-Code starts with 0 here
-	/**
-	 * +Y
-	 */
-	YP, // 1...
-
-	/**
-	 * -Z
-	 */
-	ZN,
-	/**
-	 * +Z
-	 */
-	ZP;
-
-	private Direction() {
-		int side = ordinal() / 2;
-		int sign = getSign();
-
-		xOffset = side == 0 ? sign : 0;
-		yOffset = side == 1 ? sign : 0;
-		zOffset = side == 2 ? sign : 0;
-	}
-
-	public static Direction fromSideValue(int side) {
-		return directions[(side + 2) % 6];
-	}
-
-	public static Direction fromForgeDirection(ForgeDirection dir) {
-		if (dir == ForgeDirection.UNKNOWN) return null;
-
-		return fromSideValue(dir.ordinal());
-	}
-
-	/**
-	 * Get the tile entity next to a tile entity following this direction.
-	 *
-	 * @param tileEntity tile entity to check
-	 * @return Adjacent tile entity or null if none exists
-	 */
-	public TileEntity applyToTileEntity(TileEntity te) {
-		return applyTo(te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord);
-	}
-
-	/**
-	 * Get the tile entity next to a position following this direction.
-	 *
-	 * @param world World to check
-	 * @param x X coordinate to check from
-	 * @param y Y coordinate to check from
-	 * @param z Z coordinate to check from
-	 * @return Adjacent tile entity or null if none exists
-	 */
-	public TileEntity applyTo(World world, int x, int y, int z) {
-		int coords[] = { x, y, z };
-
-		coords[ordinal() / 2] += getSign();
-
-		if (world != null && world.blockExists(coords[0], coords[1], coords[2])) {
-			try {
-				return world.getTileEntity(coords[0], coords[1], coords[2]);
-			} catch (Exception e) {
-				throw new RuntimeException("error getting TileEntity at dim "+world.provider.dimensionId+" "+coords[0]+"/"+coords[1]+"/"+coords[2]);
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Get the inverse of this direction (XN -> XP, XP -> XN, etc.)
-	 *
-	 * @return Inverse direction
-	 */
-	public Direction getInverse() {
-		return directions[ordinal() ^ 1];
-	}
-
-	/**
-	 * Convert this direction to a Minecraft side value.
-	 *
-	 * @return Minecraft side value
-	 */
-	public int toSideValue() {
-		return (ordinal() + 4) % 6;
-	}
-
-	/**
-	 * Determine direction sign (N for negative or P for positive).
-	 *
-	 * @return -1 if the direction is negative, +1 if the direction is positive
-	 */
-	private int getSign() {
-		return (ordinal() % 2) * 2 - 1;
-	}
-
-	public ForgeDirection toForgeDirection() {
-		return ForgeDirection.getOrientation(toSideValue());
-	}
-
-	public final int xOffset;
-	public final int yOffset;
-	public final int zOffset;
-
-	public static final Direction[] directions = Direction.values();
-	public static final Set<Direction> noDirections = EnumSet.noneOf(Direction.class);
-	public static final Set<Direction> allDirections = EnumSet.allOf(Direction.class);
-}
-

src/main/java/api/java/ic2/api/crops/BaseSeed.java

@@ -1,82 +0,0 @@
-package ic2.api.crops;
-
-/**
- * Base agriculture seed. Used to determine the state of a plant once it is planted from an item.
- */
-public class BaseSeed {
-	/**
-	 * Create a BaseSeed object.
-	 *
-	 * @param crop plant
-	 * @param size plant size
-	 * @param statGrowth1 plant growth stat
-	 * @param statGain1 plant gain stat
-	 * @param statResistance1 plant resistance stat
-	 * @param stackSize1 for internal usage only
-	 */
-	@SuppressWarnings("deprecation")
-	public BaseSeed(CropCard crop, int size, int statGrowth, int statGain, int statResistance, int stackSize) {
-		super();
-		this.crop = crop;
-		this.id = Crops.instance.getIdFor(crop);
-		this.size = size;
-		this.statGrowth = statGrowth;
-		this.statGain = statGain;
-		this.statResistance = statResistance;
-		this.stackSize = stackSize;
-	}
-
-	/**
-	 * @deprecated Use the CropCard version.
-	 */
-	@Deprecated
-	public BaseSeed(int id, int size, int statGrowth, int statGain, int statResistance, int stackSize) {
-		this(getCropFromId(id), size, statGrowth, statGain, statResistance, stackSize);
-	}
-
-	@SuppressWarnings("deprecation")
-	private static CropCard getCropFromId(int id) {
-		CropCard[] crops = Crops.instance.getCropList();
-
-		if (id < 0 || id >= crops.length) return null;
-
-		return crops[id];
-	}
-
-
-	/**
-	 * Plant.
-	 */
-	public final CropCard crop;
-
-	/**
-	 * @deprecated IDs aren't used anymore.
-	 */
-	@Deprecated
-	public int id;
-
-	/**
-	 * Plant size.
-	 */
-	public int size;
-
-	/**
-	 * Plant growth stat.
-	 */
-	public int statGrowth;
-
-	/**
-	 * Plant gain stat.
-	 */
-	public int statGain;
-
-	/**
-	 * Plant resistance stat.
-	 */
-	public int statResistance;
-
-	/**
-	 * For internal usage only.
-	 */
-	public int stackSize;
-}

src/main/java/api/java/ic2/api/crops/CropCard.java

@@ -1,435 +0,0 @@
-package ic2.api.crops;
-
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.ModContainer;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-/**
- * Base agriculture crop.
- *
- * Any crop extending this can be registered using registerCrop to be added into the game.
- */
-public abstract class CropCard {
-	public CropCard() {
-		modId = getModId(); // initialize mod id while we should be in the real owner's init event
-	}
-
-	/**
-	 * Plant name for identifying this crop within your mod.
-	 *
-	 * The name has to be unique within the mod and is used for saving.
-	 * By default this name will be also used to determine displayKey() and registerSprites().
-	 *
-	 * @note changing name or owner will cause existing crops in users' worlds to disappear.
-	 *
-	 * @return Plant name
-	 */
-	public abstract String name();
-
-	/**
-	 * Determine the mod id owning this crop.
-	 *
-	 * The owner serves as a name space. With every mod using a different owner, a mod only has to
-	 * make sure it doesn't have conflicts with name() in itself.
-	 * It's recommended to hard code this to your mod id as specified in the @Mod annotation.
-	 * Do not use IC2's mod id here.
-	 *
-	 * @note changing name or owner will cause existing crops in users' worlds to disappear.
-	 *
-	 * @return Mod id.
-	 */
-	public String owner() { // TODO: make abstract
-		return modId;
-	}
-
-	/**
-	 * Translation key for display to the player.
-	 *
-	 * It's highly recommended to specify a valid key from your language file here, e.g. add
-	 * "yourmod.crop.yourCropName = Your crop's name" to the language file, override name() to
-	 * return "yourCropName" and override displayName() to return "yourmod.crop."+name().
-	 *
-	 * @return Unlocalized name.
-	 */
-	public String displayName() {
-		return name(); // return the raw name for backwards compatibility
-	}
-
-	/**
-	 * Your name here, will be shown in "Discovered by:" when analyzing seeds.
-	 *
-	 * @return Your name
-	 */
-	public String discoveredBy() {
-		return "unknown";
-	}
-
-	/**
-	 * Description of your plant. Keep it short, a few characters per line for up to two lines.
-	 * Default is showing attributes of your plant, 2 per line.
-	 *
-	 * @param i line to get, starting from 0
-	 * @return The line
-	 */
-	public String desc(int i) {
-		String[] att = attributes();
-
-		if (att == null || att.length == 0) return "";
-
-		if (i == 0) {
-			String s = att[0];
-			if (att.length >= 2) {
-				s+=", "+att[1];
-				if (att.length >= 3) s+=",";
-			}
-			return s;
-		}
-		if (att.length < 3) return "";
-		String s = att[2];
-		if (att.length >= 4) s+=", "+att[3];
-		return s;
-	}
-
-	/**
-	 * *
-	 * @param crop reference to ICropTile
-	 * @return roots lengt use in isBlockBelow
-	 */
-	public int getrootslength(ICropTile crop) { // TODO: camel case
-		return 1;
-	}
-
-	/**
-	 * Tier of the plant. Ranges from 1 to 16, 0 is Weed.
-	 * Valuable and powerful crops have higher tiers, useless and weak ones have lower tiers.
-	 *
-	 * @return Tier
-	 */
-	public abstract int tier();
-
-	/**
-	 * Describe the plant through a set of stats, influencing breeding.
-	 * Plants sharing stats and attributes will tend to cross-breed more often.
-	 *
-	 * Stats:
-	 * - 0: Chemistry (Industrial uses based on chemical plant components)
-	 * - 1: Consumable (Food, potion ingredients, stuff meant to be eaten or similarly used)
-	 * - 2: Defensive (Plants with defense capabilities (damaging, explosive, chemical) or special abilities in general)
-	 * - 3: Colorful (How colorful/aesthetically/beautiful is the plant, like dye-plants or plants without actual effects)
-	 * - 4: Weed (Is this plant weed-like and rather unwanted/quick-spreading? Rare super-breed plants should have low values here)
-	 *
-	 * @param n index of the requested stat
-	 * @return The requested value of the stats
-	 */
-	public abstract int stat(int n); // TODO: change to fixed property object or builder with other attributes like tier
-
-	/**
-	 * Additional attributes of the plant, also influencing breeding.
-	 * Plants sharing stats and attributes will tend to cross-breed more often.
-	 *
-	 * @return Attributes as an array of strings
-	 */
-	public abstract String[] attributes(); // TODO: default to none
-
-	/**
-	 * Determine the max crop size.
-	 *
-	 * Currently only used for texture allocation.
-	 */
-	public abstract int maxSize();
-
-	/**
-	 * Instantiate your Icons here.
-	 *
-	 * This method will get called by IC2, don't call it yourself.
-	 *
-	 * It's highly recommended to use your own assert domain here, e.g. yourmod:crop/* instead of
-	 * ic2:crop/*, which will then read assets/yourmod/textures/blocks/crop/*.png.
-	 */
-	@SideOnly(Side.CLIENT)
-	public void registerSprites(IIconRegister iconRegister) {
-		textures = new IIcon[maxSize()];
-
-		for (int i = 1; i <= textures.length; i++) {
-			// ic2:crop/blockCrop.NAME.n is the legacy name for backwards compatiblity
-			textures[i - 1] = iconRegister.registerIcon("ic2:crop/blockCrop."+name()+"."+i);
-		}
-	}
-
-	/**
-	 * Sprite the crop is meant to be rendered with.
-	 *
-	 * @param crop reference to ICropTile
-	 * @return 0-255, representing the sprite index on the crop's spritesheet.
-	 */
-	@SideOnly(Side.CLIENT)
-	public IIcon getSprite(ICropTile crop) {
-		if (crop.getSize() <= 0 || crop.getSize() > textures.length) return null;
-
-		return textures[crop.getSize() - 1];
-	}
-
-	/**
-	 * Amount of growth points needed to increase the plant's size.
-	 * Default is 200 * tier.
-	 */
-	public int growthDuration(ICropTile crop) {
-		return tier() * 200;
-	}
-
-	/**
-	 * Check whether the plant can grow further.
-	 *
-	 * Consider:
-	 * - Humidity, nutrients and air quality
-	 * - Current size
-	 * - Light level
-	 * - Special biomes or conditions, accessible through crop.worldObj
-	 *
-	 * This method will be called upon empty upgraded crops to check whether a neighboring plant can cross onto it! Don't check if the size is greater than 0 and if the ID is real.
-	 *
-	 * @param crop reference to ICropTile
-	 * @return Whether the crop can grow
-	 */
-	public abstract boolean canGrow(ICropTile crop);
-
-	/**
-	 * Calculate the influence for the plant to grow based on humidity, nutrients and air.
-	 * Normal behavior is rating the three stats "normal", with each of them ranging from 0-30.
-	 * Basic rule: Assume everything returns 10. All together must equal 30. Add the factors to your likings, for example (humidity*0.7)+(nutrients*0.9)+(air*1.4)
-	 *
-	 * Default is humidity + nutrients + air (no factors).
-	 *
-	 * @param crop reference to ICropTile
-	 * @param humidity ground humidity, influenced by hydration
-	 * @param nutrients nutrient quality in ground, based on fertilizers
-	 * @param air air quality, influences by open gardens and less crops surrounding this one
-	 * @return 0-30
-	 */
-	public int weightInfluences(ICropTile crop, float humidity, float nutrients, float air) {
-		return (int) (humidity + nutrients + air);
-	}
-
-	/**
-	 * Used to determine whether the plant can crossbreed with another crop.
-	 * Default is allow crossbreeding if the size is greater or equal than 3.
-	 *
-	 * @param crop crop to crossbreed with
-	 */
-	public boolean canCross(ICropTile crop) {
-		return crop.getSize() >= 3;
-	}
-
-
-	/**
-	 * Called when the plant is rightclicked by a player.
-	 * Default action is harvesting.
-	 *
-	 * Only called Serverside.
-	 *
-	 * @param crop reference to ICropTile
-	 * @param player player rightclicking the crop
-	 * @return Whether the plant has changed
-	 */
-	public boolean rightclick(ICropTile crop, EntityPlayer player) {
-		return crop.harvest(true);
-	}
-
-	/**
-	 * Use in Crop Havester with insert Cropnalyzer to get best Output.
-	 *
-	 * @param crop reference to ICropTile
-	 * @return  need crop  size for best output.
-	 */
-
-	public abstract int getOptimalHavestSize(ICropTile crop); // TODO: default to maxSize
-
-	/**
-	 * Check whether the crop can be harvested.
-	 *
-	 * @param crop reference to ICropTile
-	 * @return Whether the crop can be harvested in its current state.
-	 */
-	public abstract boolean canBeHarvested(ICropTile crop); // TODO: default to maxSize check
-
-	/**
-	 * Base chance for dropping the plant's gains, specify values greater than 1 for multiple drops.
-	 * Default is 0.95^tier.
-	 *
-	 * @return Chance to drop the gains
-	 */
-	public float dropGainChance() { // TODO: change to double
-		return (float) Math.pow(0.95, tier());
-	}
-
-	/**
-	 * Item obtained from harvesting the plant.
-	 *
-	 * @param crop reference to ICropTile
-	 * @return Item obtained
-	 */
-	public abstract ItemStack getGain(ICropTile crop);
-
-	/**
-	 * Get the size of the plant after harvesting.
-	 * Default is 1.
-	 *
-	 * @param crop reference to ICropTile
-	 * @return Plant size after harvesting
-	 */
-	public byte getSizeAfterHarvest(ICropTile crop) {return 1;} // TODO: change to int
-
-
-	/**
-	 * Called when the plant is left clicked by a player.
-	 * Default action is picking the plant.
-	 *
-	 * Only called server side.
-	 *
-	 * @param crop reference to ICropTile
-	 * @param player player left clicked the crop
-	 * @return Whether the plant has changed
-	 */
-	public boolean leftclick(ICropTile crop, EntityPlayer player) { // TODO: camel case
-		return crop.pick(true);
-	}
-
-	/**
-	 * Base chance for dropping seeds when the plant is picked.
-	 * Default is 0.5*0.8^tier with a bigger chance for sizes greater than 2 and absolutely no chance for size 0.
-	 *
-	 * @param crop reference to ICropTile
-	 * @return Chance to drop the seeds
-	 */
-	public float dropSeedChance(ICropTile crop) {
-		if (crop.getSize() == 1) return 0;
-		float base = 0.5F;
-		if (crop.getSize() == 2) base/=2F;
-		for (int i = 0; i < tier(); i++) {base*=0.8;}
-		return base;
-	}
-
-	/**
-	 * Obtain seeds dropped when the plant is picked.
-	 * Multiple drops of the returned ItemStack can occur.
-	 * Default action is generating a seed from this crop.
-	 *
-	 * @param crop reference to ICropTile
-	 * @return Seeds
-	 */
-	public ItemStack getSeeds(ICropTile crop) {
-		return crop.generateSeeds(crop.getCrop(), crop.getGrowth(), crop.getGain(), crop.getResistance(), crop.getScanLevel());
-	}
-
-	/**
-	 * Called when a neighbor block to the crop has changed.
-	 *
-	 * @param crop reference to ICropTile
-	 */
-	public void onNeighbourChange(ICropTile crop) {
-		//
-	}
-
-	/**
-	 * Check if the crop should emit redstone.
-	 *
-	 * @return Whether the crop should emit redstone
-	 */
-	public int emitRedstone(ICropTile crop) {return 0;}
-
-	/**
-	 * Called when the crop is destroyed.
-	 *
-	 * @param crop reference to ICropTile
-	 */
-	public void onBlockDestroyed(ICropTile crop) {
-		//
-	}
-
-	/**
-	 * Get the light value emitted by the plant.
-	 *
-	 * @param crop reference to ICropTile
-	 * @return Light value emitted
-	 */
-	public int getEmittedLight(ICropTile crop) {
-		return 0;
-	}
-
-	/**
-	 * Default is true if the entity is an EntityLiving in jumping or sprinting state.
-	 *
-	 * @param crop reference to ICropTile
-	 * @param entity entity colliding
-	 * @return Whether trampling calculation should happen, return false if the plant is no longer valid.
-	 */
-	public boolean onEntityCollision(ICropTile crop, Entity entity) {
-		if (entity instanceof EntityLivingBase) {
-			return ((EntityLivingBase) entity).isSprinting();
-		}
-
-		return false;
-	}
-
-
-	/**
-	 * Called every time the crop ticks.
-	 * Should be called every 256 ticks or around 13 seconds.
-	 *
-	 * @param crop reference to ICropTile
-	 */
-	public void tick(ICropTile crop) {
-		// nothing by default
-	}
-
-	/**
-	 * Check whether this plant spreads weed to surrounding tiles.
-	 * Default is true if the plant has a high growth stat (or is weeds) and size greater or equal than 2.
-	 *
-	 * @param crop reference to ICropTile
-	 * @return Whether the plant spreads weed
-	 */
-	public boolean isWeed(ICropTile crop) {
-		return crop.getSize() >= 2 &&
-				(crop.getCrop() == Crops.weed || crop.getGrowth() >= 24);
-	}
-
-
-	/**
-	 * Get this plant's ID.
-	 *
-	 * @return ID of this CropCard or -1 if it's not registered
-	 * @deprecated IDs aren't used anymore.
-	 */
-	@Deprecated
-	public final int getId() {
-		return Crops.instance.getIdFor(this);
-	}
-
-	private static String getModId() {
-		ModContainer modContainer = Loader.instance().activeModContainer();
-
-		if (modContainer != null) {
-			return modContainer.getModId();
-		} else {
-			// this is bad if you are not actually IC2
-			assert false;
-
-			return "unknown";
-		}
-	}
-
-	@SideOnly(Side.CLIENT)
-	protected IIcon textures[];
-
-	private final String modId; // TODO: make owner abstract, remove modId auto detection
-	// TODO: add a clean way to obtain world reference and position
-}

src/main/java/api/java/ic2/api/crops/Crops.java

@@ -1,151 +0,0 @@
-package ic2.api.crops;
-
-import java.util.Collection;
-
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.biome.BiomeGenBase;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-import net.minecraftforge.common.BiomeDictionary.Type;
-
-/**
- * General management of the crop system.
- */
-public abstract class Crops {
-	public static Crops instance;
-
-	public static CropCard weed; // weed has special properties, thus it's exposed here
-
-	/**
-	 * Adds a crop nutrient biome bonus.
-	 *
-	 * +10/-10  0 indicates no bonus and negative values indicate a penalty.
-	 *
-	 * @param type Forge biome type to apply the bonus in
-	 * @param nutrientsBonus Nutrient stat bonus
-	 */
-	public abstract void addBiomenutrientsBonus(Type type, int nutrientsBonus);
-
-	/**
-	 * Adds a crop humidity biome bonus.
-	 *
-	 * +10/-10 0 indicates no bonus and negative values indicate a penalty.
-	 *
-	 * @param type Forge biome type to apply the bonus in
-	 * @param humidityBonus Humidity stat bonus
-	 */
-	public abstract void addBiomehumidityBonus(Type type, int humidityBonus);
-
-
-	/**
-	 * Gets the humidity bonus for a biome.
-	 *
-	 * @param biome Biome to check
-	 * @return Humidity bonus or 0 if none
-	 */
-	public abstract int getHumidityBiomeBonus(BiomeGenBase biome);
-
-	/**
-	 * Gets the nutrient bonus for a biome.
-	 *
-	 * @param biome Biome to check
-	 * @return Nutrient bonus or 0 if none
-	 */
-	public abstract int getNutrientBiomeBonus(BiomeGenBase biome);
-
-	/**
-	 * Get the crop card for the specified owner and name.
-	 *
-	 * @param owner CropCard owner mod id.
-	 * @param name CropCard name.
-	 * @return Matching CropCard.
-	 */
-	public abstract CropCard getCropCard(String owner, String name);
-
-	/**
-	 * Get the crop card for the specified seed item stack.
-	 *
-	 * @param stack ItemStack containing seeds for the crop.
-	 * @return Matching CropCard.
-	 */
-	public abstract CropCard getCropCard(ItemStack stack);
-
-	/**
-	 * Returns a list of all crops.
-	 *
-	 * @return All registered crops.
-	 */
-	public abstract Collection<CropCard> getCrops();
-
-	/**
-	 * Returns the list of registered crops.
-	 *
-	 * @return Registered crops by ID
-	 */
-	@Deprecated
-	public abstract CropCard[] getCropList();
-
-	/**
-	 * Register a plant.
-	 *
-	 * @param crop Plant to register.
-	 * @return Autoassigned id for legacy compatibility, TODO: change to void.
-	 */
-	public abstract short registerCrop(CropCard crop);
-
-	/**
-	 * Register a plant and provide a legacy id for migration.
-	 *
-	 * @param crop Plant to register.
-	 * @param legacyId ID previously used for this crop.
-	 * @return true, TODO: change to void.
-	 */
-	public abstract boolean registerCrop(CropCard crop, int legacyId);
-
-	/**
-	 * @deprecated use the CropCard version.
-	 */
-	@Deprecated
-	public abstract boolean registerBaseSeed(ItemStack stack, int id, int size, int growth, int gain, int resistance);
-
-	/**
-	 * Registers a base seed, an item used to plant a crop.
-	 *
-	 * @param stack item
-	 * @param id plant ID
-	 * @param size initial size
-	 * @param growth initial growth stat
-	 * @param gain initial gain stat
-	 * @param resistance initial resistance stat
-	 * @return True if successful
-	 */
-	public abstract boolean registerBaseSeed(ItemStack stack, CropCard crop, int size, int growth, int gain, int resistance);
-
-	/**
-	 * Finds a base seed from the given item.
-	 *
-	 * @return Base seed or null if none found
-	 */
-	public abstract BaseSeed getBaseSeed(ItemStack stack);
-
-	/**
-	 * Execute registerSprites for all registered crop cards.
-	 *
-	 * This method will get called by IC2, don't call it yourself.
-	 */
-	@SideOnly(Side.CLIENT)
-	public abstract void startSpriteRegistration(IIconRegister iconRegister);
-
-	/**
-	 * Returns the ID for the given crop.
-	 *
-	 * @param crop Crop to look up
-	 * @return ID, or -1 if not found
-	 * @deprecated IDs aren't used anymore.
-	 */
-	@Deprecated
-	public abstract int getIdFor(CropCard crop);
-}

src/main/java/api/java/ic2/api/crops/ICropTile.java

@@ -1,289 +0,0 @@
-package ic2.api.crops;
-
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.ChunkCoordinates;
-import net.minecraft.world.World;
-
-/**
- * Interface implemented by the crop tile entity.
- */
-public interface ICropTile {
-	/**
-	 * Get the crop.
-	 *
-	 * @return CropCard, or null if there is no plant currently on the crop
-	 */
-	public CropCard getCrop();
-
-	/**
-	 * Set the crop.
-	 *
-	 * @param cropCard CropCard or null for no plant
-	 */
-	public void setCrop(CropCard cropCard);
-
-	/**
-	 * @deprecated IDs have been removed.
-	 */
-	@Deprecated
-	public short getID();
-
-	/**
-	 * @deprecated IDs have been removed.
-	 */
-	@Deprecated
-	public void setID(short id);
-
-	/**
-	 * Get the crop's plant size.
-	 *
-	 * @return Plant size, starting with 1 and maximum varies depending on plant
-	 */
-	public byte getSize();
-
-	/**
-	 * Set the crop's plant size.
-	 *
-	 * @param size Plant size
-	 */
-	public void setSize(byte size);
-
-	/**
-	 * Get the crop's plant growth stat.
-	 * Higher values indicate faster growth.
-	 *
-	 * @return Plant growth stat
-	 */
-	public byte getGrowth();
-
-	/**
-	 * Set the crop's plant growth stat.
-	 *
-	 * @param growth Plant growth stat
-	 */
-	public void setGrowth(byte growth);
-
-	/**
-	 * Get the crop's plant gain stat.
-	 * Higher values indicate more drops.
-	 *
-	 * @return Plant gain stat
-	 */
-	public byte getGain();
-
-	/**
-	 * Set the crop's plant gain stat.
-	 *
-	 * @param gain Plant gain stat
-	 */
-	public void setGain(byte gain);
-
-	/**
-	 * Get the crop's plant resistance stat.
-	 * Higher values indicate more resistance against trampling.
-	 *
-	 * @return Plant resistance stat
-	 */
-	public byte getResistance();
-
-	/**
-	 * Set the crop's plant resistance stat.
-	 *
-	 * @param resistance Plant resistance stat
-	 */
-	public void setResistance(byte resistance);
-
-	/**
-	 * Get the crop's plant scan level.
-	 * Increases every time the seed is analyzed.
-	 *
-	 * @return Plant scan level
-	 */
-	public byte getScanLevel();
-
-	/**
-	 * Set the crop's plant scan level.
-	 *
-	 * @param scanLevel Plant scan level
-	 */
-	public void setScanLevel(byte scanLevel);
-
-	/**
-	 * Get the crop's plant custom data, stored alongside the crop.
-	 * Can be modified in place.
-	 *
-	 * @return Plant custom data
-	 */
-	public NBTTagCompound getCustomData();
-
-	/**
-	 * Get the crop's nutrient storage.
-	 * Ranges from 0 to 100.
-	 *
-	 * @return Crop nutrient storage
-	 */
-	public int getNutrientStorage();
-
-	/**
-	 * Set the crop's nutrient storage.
-	 *
-	 * @param nutrientStorage Crop nutrient storage
-	 */
-	public void setNutrientStorage(int nutrientStorage);
-
-	/**
-	 * Get the crop's hydration storage.
-	 * 0 indicates nothing, 1-10 indicate water hydration and 11-100 for hydration cells.
-	 *
-	 * @return Crop hydration storage
-	 */
-	public int getHydrationStorage();
-
-	/**
-	 * Set the crop's hydration storage.
-	 *
-	 * @param hydrationStorage Crop hydration storage
-	 */
-	public void setHydrationStorage(int hydrationStorage);
-
-	/**
-	 * Get the crop's Weed-Ex storage.
-	 *
-	 * @return Crop Weed-Ex storage
-	 */
-	public int getWeedExStorage();
-
-	/**
-	 * Set the crop's Weed-Ex storage.
-	 *
-	 * @param weedExStorage Crop Weed-Ex storage
-	 */
-	public void setWeedExStorage(int weedExStorage);
-
-	/**
-	 * Get the crop's humidity.
-	 * Ranges from 0 (dry) to 10 (humid).
-	 * Updates every couple of seconds or when an update is requested.
-	 *
-	 * @see #updateState()
-	 *
-	 * @return Crop humidity level
-	 */
-	public byte getHumidity();
-
-	/**
-	 * Get the crop's nutrient level.
-	 * Ranges from 0 (empty) to 10 (full).
-	 * Updates every couple of seconds or when an update is requested.
-	 *
-	 * @see #updateState()
-	 *
-	 * @return Crop nutrient level
-	 */
-	public byte getNutrients();
-
-	/**
-	 * Get the crop's air quality.
-	 * Ranges from 0 (cluttered) to 10 (fresh).
-	 * Updates every couple of seconds or when an update is requested.
-	 *
-	 * @see #updateState()
-	 *
-	 * @return Crop air quality
-	 */
-	public byte getAirQuality();
-
-	/**
-	 * Get the crop's world.
-	 *
-	 * @return Crop world
-	 */
-	public World getWorld();
-
-	/**
-	 * Get the crop's location.
-	 *
-	 * @return Crop location
-	 */
-	public ChunkCoordinates getLocation();
-
-	/**
-	 * Get the crop's light level.
-	 *
-	 * @return Crop light level
-	 */
-	public int getLightLevel();
-
-	/**
-	 * Pick the crop, removing and giving seeds for the plant.
-	 *
-	 * @param manual whether it was done by hand (not automated)
-	 * @return true if successfully picked
-	 */
-	public boolean pick(boolean manual);
-
-	/**
-	 * Harvest the crop, turning it into gain and resetting its size.
-	 * drop output on ground
-	 * @param manual
-	 * @return true if successfully harvested
-	 */
-	public boolean harvest(boolean manual);
-
-	/**
-	 * Harvest the crop, turning it into gain and resetting its size.
-	 * drop output on ground
-	 * @param Optimal force check getOptimalHavestSize() for harvest
-	 * @return ItemStack[] of harvest output
-	 */
-
-	ItemStack[] harvest_automated(boolean Optimal);
-
-	/**
-	 * Fully clears the crop without dropping anything.
-	 */
-	public void reset();
-
-	/**
-	 * Request a texture and lighting update.
-	 */
-	public void updateState();
-
-	/**
-	 * Check if a block is under the farmland containing the crop.
-	 * Searches up to 2 blocks below the farmland or an air space, whichever appears first.
-	 *
-	 * @param block block to search
-	 * @return Whether the block was found
-	 */
-	public boolean isBlockBelow(Block block);
-
-	/**
-	 * Check if a block is under the farmland containing the crop.
-	 * Searches up to 2 blocks below the farmland or an air space, whichever appears first.
-	 *
-	 * @param oreDictionaryName blocks to search
-	 * @return Whether the blocks were found
-	 */
-	public boolean isBlockBelow(String oreDictionaryName);
-
-	/**
-	 * Generate plant seeds with the given parameters.
-	 *
-	 * @param crop plant
-	 * @param growth plant growth stat
-	 * @param gain plant gain stat
-	 * @param resis plant resistance stat
-	 * @param scan plant scan level
-	 * @return Plant seed item
-	 */
-	public ItemStack generateSeeds(CropCard crop, byte growth, byte gain, byte resis, byte scan);
-
-	/**
-	 * @deprecated Use the CropCard version instead.
-	 */
-	@Deprecated
-	public ItemStack generateSeeds(short plant, byte growth, byte gain, byte resis, byte scan);
-}

src/main/java/api/java/ic2/api/crops/package-info.java

@@ -1,4 +0,0 @@
-@API(apiVersion="1.0", owner="IC2", provides="IC2API")
-package ic2.api.crops;
-import cpw.mods.fml.common.API;
-

src/main/java/api/java/ic2/api/energy/EnergyNet.java

@@ -1,18 +0,0 @@
-package ic2.api.energy;
-
-
-/**
- * Provides access to the energy network.
- * 
- * The old EnergyNet methods missing in IEnergyNet have been migrated to events (load, unload) or
- * removed (tiles no longer emit energy actively, the energy net implementation requests it).
- * 
- * See ic2/api/energy/usage.txt for an overall description of the energy net api.
- */
-public final class EnergyNet {
-	/**
-	 * Instance of the global EnergyNet class.
-	 */
-	public static IEnergyNet instance;
-}
-

src/main/java/api/java/ic2/api/energy/IEnergyNet.java

@@ -1,86 +0,0 @@
-package ic2.api.energy;
-
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-
-import net.minecraftforge.common.util.ForgeDirection;
-
-/**
- * Interface representing the methods provided by the global EnergyNet class.
- * 
- * See ic2/api/energy/usage.txt for an overall description of the energy net api.
- */
-public interface IEnergyNet {
-	/**
-	 * Get the EnergyNet-registered tile entity at the specified position.
-	 * 
-	 * This is not the same as World.getTileEntity(), it's possible to register delegate tile
-	 * entities with the energy net which are different from what's actually in the world. Those
-	 * delegates allow to use separate TileEntity objects just for the EnergyNet interfaces,
-	 * simplifying cross-mod dependencies and multi-blocks.
-	 * 
-	 * @param world World containing the tile entity
-	 * @param x x-coordinate
-	 * @param y y-coordinate
-	 * @param z z-coordinate
-	 * @return tile entity registered to the energy net or null if none is registered
-	 */
-	TileEntity getTileEntity(World world, int x, int y, int z);
-
-	/**
-	 * Get the EnergyNet-registered neighbor tile entity at the specified position.
-	 * 
-	 * @param te TileEntity indicating the world and position to search from
-	 * @param dir direction the neighbor is to be found
-	 * @return neighbor tile entity registered to the energy net or null if none is registered
-	 */
-	TileEntity getNeighbor(TileEntity te, ForgeDirection dir);
-
-	/**
-	 * determine how much energy has been emitted by the EnergyEmitter specified
-	 *
-	 * @note call this twice with x ticks delay to get the avg. emitted power p = (call2 - call1) / x EU/tick
-	 *
-	 * @param tileEntity energy emitter
-	 * @deprecated Discontinued, use getNodeStats instead.
-	 */
-	@Deprecated
-	double getTotalEnergyEmitted(TileEntity tileEntity);
-
-	/**
-	 * determine how much energy has been sunken by the EnergySink specified
-	 *
-	 * @note call this twice with x ticks delay to get the avg. sunken power p = (call2 - call1) / x EU/tick
-	 *
-	 * @param tileEntity energy emitter
-	 * @deprecated Discontinued, use getNodeStats instead.
-	 */
-	@Deprecated
-	double getTotalEnergySunken(TileEntity tileEntity);
-
-	/**
-	 * Retrieve statistics for the tile entity specified.
-	 * 
-	 * The statistics apply to the last simulated tick.
-	 * 
-	 * @param te Tile entity to check.
-	 * @return Statistics for the tile entity.
-	 */
-	NodeStats getNodeStats(TileEntity te);
-
-	/**
-	 * Determine the typical power used by the specific tier, e.g. 128 eu/t for tier 2.
-	 * 
-	 * @param tier tier
-	 * @return power in eu/t
-	 */
-	double getPowerFromTier(int tier);
-
-	/**
-	 * Determine minimum tier required to handle the specified power, e.g. tier 2 for 128 eu/t.
-	 * 
-	 * @param power in eu/t
-	 * @return tier
-	 */
-	int getTierFromPower(double power);
-}

src/main/java/api/java/ic2/api/energy/NodeStats.java

@@ -1,25 +0,0 @@
-package ic2.api.energy;
-
-public class NodeStats {
-	public NodeStats(double energyIn, double energyOut, double voltage) {
-		this.energyIn = energyIn;
-		this.energyOut = energyOut;
-		this.voltage = voltage;
-	}
-
-	public double getEnergyIn() {
-		return energyIn;
-	}
-
-	public double getEnergyOut() {
-		return energyOut;
-	}
-
-	public double getVoltage() {
-		return voltage;
-	}
-
-	protected double energyIn;
-	protected double energyOut;
-	protected double voltage;
-}

src/main/java/api/java/ic2/api/energy/event/EnergyTileEvent.java

@@ -1,25 +0,0 @@
-package ic2.api.energy.event;
-
-import net.minecraft.tileentity.TileEntity;
-
-import net.minecraftforge.event.world.WorldEvent;
-
-import ic2.api.energy.tile.IEnergyTile;
-
-/**
- * Base class for energy net events, don't use it directly.
- *
- * See ic2/api/energy/usage.txt for an overall description of the energy net api.
- */
-public class EnergyTileEvent extends WorldEvent {
-	public final IEnergyTile energyTile;
-
-	public EnergyTileEvent(IEnergyTile energyTile1) {
-		super(((TileEntity) energyTile1).getWorldObj());
-
-		if (world == null) throw new NullPointerException("world is null");
-
-		this.energyTile = energyTile1;
-	}
-}
-

src/main/java/api/java/ic2/api/energy/event/EnergyTileLoadEvent.java

@@ -1,26 +0,0 @@
-package ic2.api.energy.event;
-
-import ic2.api.energy.tile.IEnergyTile;
-
-/**
- * Event announcing new energy tiles.
- *
- * This event notifies subscribers of loaded energy tiles, e.g. after getting
- * loaded through the chunk they are in or after being placed down by the
- * player or another deployer mechanism.
- *
- * Every energy tile which wants to get connected to the IC2 Energy Network has
- * to either post this event or alternatively call EnergyNet.addTileEntity().
- *
- * You may use this event to build a static representation of energy tiles for
- * your own energy grid implementation if you need to. It's not required if you
- * always lookup energy paths on demand.
- * 
- * See ic2/api/energy/usage.txt for an overall description of the energy net api.
- */
-public class EnergyTileLoadEvent extends EnergyTileEvent {
-	public EnergyTileLoadEvent(IEnergyTile energyTile1) {
-		super(energyTile1);
-	}
-}
-

src/main/java/api/java/ic2/api/energy/event/EnergyTileUnloadEvent.java

@@ -1,27 +0,0 @@
-package ic2.api.energy.event;
-
-import ic2.api.energy.tile.IEnergyTile;
-
-/**
- * Event announcing terminated energy tiles.
- *
- * This event notifies subscribers of unloaded energy tiles, e.g. after getting
- * unloaded through the chunk they are in or after being destroyed by the
- * player or another block pick/destruction mechanism.
- *
- * Every energy tile which wants to get disconnected from the IC2 Energy
- * Network has to either post this event or alternatively call
- * EnergyNet.removeTileEntity().
- *
- * You may use this event to build a static representation of energy tiles for
- * your own energy grid implementation if you need to. It's not required if you
- * always lookup energy paths on demand.
- * 
- * See ic2/api/energy/usage.txt for an overall description of the energy net api.
- */
-public class EnergyTileUnloadEvent extends EnergyTileEvent {
-	public EnergyTileUnloadEvent(IEnergyTile energyTile1) {
-		super(energyTile1);
-	}
-}
-

src/main/java/api/java/ic2/api/energy/event/package-info.java

@@ -1,4 +0,0 @@
-@API(apiVersion="1.0", owner="IC2", provides="IC2API")
-package ic2.api.energy.event;
-import cpw.mods.fml.common.API;
-

src/main/java/api/java/ic2/api/energy/package-info.java

@@ -1,4 +0,0 @@
-@API(apiVersion="1.0", owner="IC2", provides="IC2API")
-package ic2.api.energy;
-import cpw.mods.fml.common.API;
-

src/main/java/api/java/ic2/api/energy/prefab/BasicSink.java

@@ -1,373 +0,0 @@
-package ic2.api.energy.prefab;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import ic2.api.energy.event.EnergyTileLoadEvent;
-import ic2.api.energy.event.EnergyTileUnloadEvent;
-import ic2.api.energy.tile.IEnergySink;
-import ic2.api.info.Info;
-import ic2.api.item.ElectricItem;
-
-/**
- * BasicSink is a simple adapter to provide an ic2 energy sink.
- * 
- * It's designed to be attached to a tile entity as a delegate. Functionally BasicSink acts as a
- * one-time configurable input energy buffer, thus providing a common use case for machines.
- * 
- * Sub-classing BasicSink instead of using it as a delegate works as well, but isn't recommended.
- * The delegate can be extended with additional functionality through a sub class though.
- * 
- * The constraints set by BasicSink like the strict tank-like energy buffering should provide a
- * more easy to use and stable interface than using IEnergySink directly while aiming for
- * optimal performance.
- * 
- * Using BasicSink involves the following steps:
- * - create a BasicSink instance in your TileEntity, typically in a field
- * - forward invalidate, onChunkUnload, readFromNBT, writeToNBT and updateEntity to the BasicSink
- *   instance.
- *   If you have other means of determining when the tile entity is fully loaded, notify onLoaded
- *   that way instead of forwarding updateEntity.
- * - call useEnergy whenever appropriate. canUseEnergy determines if enough energy is available
- *   without consuming the energy.
- * - optionally use getEnergyStored to display the output buffer charge level
- * - optionally use setEnergyStored to sync the stored energy to the client (e.g. in the Container)
- *
- * Example implementation code:
- * @code{.java}
- * public class SomeTileEntity extends TileEntity {
- *     // new basic energy sink, 1000 EU buffer, tier 1 (32 EU/t, LV)
- *     private BasicSink ic2EnergySink = new BasicSink(this, 1000, 1);
- * 
- *     @Override
- *     public void invalidate() {
- *         ic2EnergySink.invalidate(); // notify the energy sink
- *         ...
- *         super.invalidate(); // this is important for mc!
- *     }
- * 
- *     @Override
- *     public void onChunkUnload() {
- *         ic2EnergySink.onChunkUnload(); // notify the energy sink
- *         ...
- *     }
- * 
- *     @Override
- *     public void readFromNBT(NBTTagCompound tag) {
- *         super.readFromNBT(tag);
- * 
- *         ic2EnergySink.readFromNBT(tag);
- *         ...
- *     }
- * 
- *     @Override
- *     public void writeToNBT(NBTTagCompound tag) {
- *         super.writeToNBT(tag);
- * 
- *         ic2EnergySink.writeToNBT(tag);
- *         ...
- *     }
- * 
- *     @Override
- *     public void updateEntity() {
- *         ic2EnergySink.updateEntity(); // notify the energy sink
- *         ...
- *         if (ic2EnergySink.useEnergy(5)) { // use 5 eu from the sink's buffer this tick
- *             ... // do something with the energy
- *         }
- *         ...
- *     }
- * 
- *     ...
- * }
- * @endcode
- */
-public class BasicSink extends TileEntity implements IEnergySink {
-	// **********************************
-	// *** Methods for use by the mod ***
-	// **********************************
-
-	/**
-	 * Constructor for a new BasicSink delegate.
-	 * 
-	 * @param parent1 TileEntity represented by this energy sink.
-	 * @param capacity1 Maximum amount of eu to store.
-	 * @param tier1 IC2 tier, 1 = LV, 2 = MV, ...
-	 */
-	public BasicSink(TileEntity parent1, int capacity1, int tier1) {
-		this.parent = parent1;
-		this.capacity = capacity1;
-		this.tier = tier1;
-	}
-
-	// in-world te forwards	>>
-
-	/**
-	 * Forward for the base TileEntity's updateEntity(), used for creating the energy net link.
-	 * Either updateEntity or onLoaded have to be used.
-	 */
-	@Override
-	public void updateEntity() {
-		if (!addedToEnet) onLoaded();
-	}
-
-	/**
-	 * Notification that the base TileEntity finished loaded, for advanced uses.
-	 * Either updateEntity or onLoaded have to be used.
-	 */
-	public void onLoaded() {
-		if (!addedToEnet &&
-				!FMLCommonHandler.instance().getEffectiveSide().isClient() &&
-				Info.isIc2Available()) {
-			worldObj = parent.getWorldObj();
-			xCoord = parent.xCoord;
-			yCoord = parent.yCoord;
-			zCoord = parent.zCoord;
-
-			MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent(this));
-
-			addedToEnet = true;
-		}
-	}
-
-	/**
-	 * Forward for the base TileEntity's invalidate(), used for destroying the energy net link.
-	 * Both invalidate and onChunkUnload have to be used.
-	 */
-	@Override
-	public void invalidate() {
-		super.invalidate();
-
-		onChunkUnload();
-	}
-
-	/**
-	 * Forward for the base TileEntity's onChunkUnload(), used for destroying the energy net link.
-	 * Both invalidate and onChunkUnload have to be used.
-	 */
-	@Override
-	public void onChunkUnload() {
-		if (addedToEnet &&
-				Info.isIc2Available()) {
-			MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(this));
-
-			addedToEnet = false;
-		}
-	}
-
-	/**
-	 * Forward for the base TileEntity's readFromNBT(), used for loading the state.
-	 * 
-	 * @param tag Compound tag as supplied by TileEntity.readFromNBT()
-	 */
-	@Override
-	public void readFromNBT(NBTTagCompound tag) {
-		super.readFromNBT(tag);
-
-		NBTTagCompound data = tag.getCompoundTag("IC2BasicSink");
-
-		energyStored = data.getDouble("energy");
-	}
-
-	/**
-	 * Forward for the base TileEntity's writeToNBT(), used for saving the state.
-	 * 
-	 * @param tag Compound tag as supplied by TileEntity.writeToNBT()
-	 */
-	@Override
-	public void writeToNBT(NBTTagCompound tag) {
-		try {
-			super.writeToNBT(tag);
-		} catch (RuntimeException e) {
-			// happens if this is a delegate, ignore
-		}
-
-		NBTTagCompound data = new NBTTagCompound();
-
-		data.setDouble("energy", energyStored);
-
-		tag.setTag("IC2BasicSink", data);
-	}
-
-	// << in-world te forwards
-	// methods for using this adapter >>
-
-	/**
-	 * Get the maximum amount of energy this sink can hold in its buffer.
-	 * 
-	 * @return Capacity in EU.
-	 */
-	public int getCapacity() {
-		return capacity;
-	}
-
-	/**
-	 * Set the maximum amount of energy this sink can hold in its buffer.
-	 * 
-	 * @param capacity1 Capacity in EU.
-	 */
-	public void setCapacity(int capacity1) {
-		this.capacity = capacity1;
-	}
-
-	/**
-	 * Get the IC2 energy tier for this sink.
-	 * 
-	 * @return IC2 Tier.
-	 */
-	public int getTier() {
-		return tier;
-	}
-
-	/**
-	 * Set the IC2 energy tier for this sink.
-	 * 
-	 * @param tier1 IC2 Tier.
-	 */
-	public void setTier(int tier1) {
-		this.tier = tier1;
-	}
-
-	/**
-	 * Determine the energy stored in the sink's input buffer.
-	 * 
-	 * @return amount in EU, may be above capacity
-	 */
-	public double getEnergyStored() {
-		return energyStored;
-	}
-
-	/**
-	 * Set the stored energy to the specified amount.
-	 * 
-	 * This is intended for server -> client synchronization, e.g. to display the stored energy in
-	 * a GUI through getEnergyStored().
-	 * 
-	 * @param amount
-	 */
-	public void setEnergyStored(double amount) {
-		energyStored = amount;
-	}
-
-	/**
-	 * Determine if the specified amount of energy is available.
-	 * 
-	 * @param amount in EU
-	 * @return true if the amount is available
-	 */
-	public boolean canUseEnergy(double amount) {
-		return energyStored >= amount;
-	}
-
-	/**
-	 * Use the specified amount of energy, if available.
-	 * 
-	 * @param amount amount to use
-	 * @return true if the amount was available
-	 */
-	public boolean useEnergy(double amount) {
-		if (canUseEnergy(amount) && !FMLCommonHandler.instance().getEffectiveSide().isClient()) {
-			energyStored -= amount;
-
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Discharge the supplied ItemStack into this sink's energy buffer.
-	 * 
-	 * @param stack ItemStack to discharge (null is ignored)
-	 * @param limit Transfer limit, values <= 0 will use the battery's limit
-	 * @return true if energy was transferred
-	 */
-	public boolean discharge(ItemStack stack, int limit) {
-		if (stack == null || !Info.isIc2Available()) return false;
-
-		double amount = capacity - energyStored;
-		if (amount <= 0) return false;
-
-		if (limit > 0 && limit < amount) amount = limit;
-
-		amount = ElectricItem.manager.discharge(stack, amount, tier, limit > 0, true, false);
-
-		energyStored += amount;
-
-		return amount > 0;
-	}
-
-	// << methods for using this adapter
-
-	// backwards compatibility (ignore these) >>
-
-	@Deprecated
-	public void onUpdateEntity() {
-		updateEntity();
-	}
-
-	@Deprecated
-	public void onInvalidate() {
-		invalidate();
-	}
-
-	@Deprecated
-	public void onOnChunkUnload() {
-		onChunkUnload();
-	}
-
-	@Deprecated
-	public void onReadFromNbt(NBTTagCompound tag) {
-		readFromNBT(tag);
-	}
-
-	@Deprecated
-	public void onWriteToNbt(NBTTagCompound tag) {
-		writeToNBT(tag);
-	}
-
-	// << backwards compatibility
-
-	// ******************************
-	// *** Methods for use by ic2 ***
-	// ******************************
-
-	// energy net interface >>
-
-	@Override
-	public boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction) {
-		return true;
-	}
-
-	@Override
-	public double getDemandedEnergy() {
-		return Math.max(0, capacity - energyStored);
-	}
-
-	@Override
-	public double injectEnergy(ForgeDirection directionFrom, double amount, double voltage) {
-		energyStored += amount;
-
-		return 0;
-	}
-
-	@Override
-	public int getSinkTier() {
-		return tier;
-	}
-
-	// << energy net interface
-
-
-	public final TileEntity parent;
-
-	protected int capacity;
-	protected int tier;
-	protected double energyStored;
-	protected boolean addedToEnet;
-}

src/main/java/api/java/ic2/api/energy/prefab/BasicSource.java

@@ -1,375 +0,0 @@
-package ic2.api.energy.prefab;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import ic2.api.energy.EnergyNet;
-import ic2.api.energy.event.EnergyTileLoadEvent;
-import ic2.api.energy.event.EnergyTileUnloadEvent;
-import ic2.api.energy.tile.IEnergySource;
-import ic2.api.info.Info;
-import ic2.api.item.ElectricItem;
-
-/**
- * BasicSource is a simple adapter to provide an ic2 energy source.
- * 
- * It's designed to be attached to a tile entity as a delegate. Functionally BasicSource acts as a
- * one-time configurable output energy buffer, thus providing a common use case for generators.
- * 
- * Sub-classing BasicSource instead of using it as a delegate works as well, but isn't recommended.
- * The delegate can be extended with additional functionality through a sub class though.
- * 
- * The constraints set by BasicSource like the strict tank-like energy buffering should provide a
- * more easy to use and stable interface than using IEnergySource directly while aiming for
- * optimal performance.
- * 
- * Using BasicSource involves the following steps:
- * - create a BasicSource instance in your TileEntity, typically in a field
- * - forward invalidate, onChunkUnload, readFromNBT, writeToNBT and updateEntity to the BasicSource
- *   instance.
- *   If you have other means of determining when the tile entity is fully loaded, notify onLoaded
- *   that way instead of forwarding updateEntity.
- * - call addEnergy whenever appropriate, using getFreeCapacity may determine if e.g. the generator
- *   should run
- * - optionally use getEnergyStored to display the output buffer charge level
- * - optionally use setEnergyStored to sync the stored energy to the client (e.g. in the Container)
- *
- * Example implementation code:
- * @code{.java}
- * public class SomeTileEntity extends TileEntity {
- *     // new basic energy source, 1000 EU buffer, tier 1 (32 EU/t, LV)
- *     private BasicSource ic2EnergySource = new BasicSource(this, 1000, 1);
- * 
- *     @Override
- *     public void invalidate() {
- *         ic2EnergySource.invalidate(); // notify the energy source
- *         ...
- *         super.invalidate(); // this is important for mc!
- *     }
- * 
- *     @Override
- *     public void onChunkUnload() {
- *         ic2EnergySource.onChunkUnload(); // notify the energy source
- *         ...
- *     }
- * 
- *     @Override
- *     public void readFromNBT(NBTTagCompound tag) {
- *         super.readFromNBT(tag);
- * 
- *         ic2EnergySource.readFromNBT(tag);
- *         ...
- *     }
- * 
- *     @Override
- *     public void writeToNBT(NBTTagCompound tag) {
- *         super.writeToNBT(tag);
- * 
- *         ic2EnergySource.writeToNBT(tag);
- *         ...
- *     }
- * 
- *     @Override
- *     public void updateEntity() {
- *         ic2EnergySource.updateEntity(); // notify the energy source
- *         ...
- *         ic2EnergySource.addEnergy(5); // add 5 eu to the source's buffer this tick
- *         ...
- *     }
- * 
- *     ...
- * }
- * @endcode
- */
-public class BasicSource extends TileEntity implements IEnergySource {
-	// **********************************
-	// *** Methods for use by the mod ***
-	// **********************************
-
-	/**
-	 * Constructor for a new BasicSource delegate.
-	 * 
-	 * @param parent1 Base TileEntity represented by this energy source.
-	 * @param capacity1 Maximum amount of eu to store.
-	 * @param tier1 IC2 tier, 1 = LV, 2 = MV, ...
-	 */
-	public BasicSource(TileEntity parent1, double capacity1, int tier1) {
-		double power = EnergyNet.instance.getPowerFromTier(tier1);
-
-		this.parent = parent1;
-		this.capacity = capacity1 < power ? power : capacity1;
-		this.tier = tier1;
-		this.power = power;
-	}
-
-	// in-world te forwards	>>
-
-	/**
-	 * Forward for the base TileEntity's updateEntity(), used for creating the energy net link.
-	 * Either updateEntity or onLoaded have to be used.
-	 */
-	@Override
-	public void updateEntity() {
-		if (!addedToEnet) onLoaded();
-	}
-
-	/**
-	 * Notification that the base TileEntity finished loading, for advanced uses.
-	 * Either updateEntity or onLoaded have to be used.
-	 */
-	public void onLoaded() {
-		if (!addedToEnet &&
-				!FMLCommonHandler.instance().getEffectiveSide().isClient() &&
-				Info.isIc2Available()) {
-			worldObj = parent.getWorldObj();
-			xCoord = parent.xCoord;
-			yCoord = parent.yCoord;
-			zCoord = parent.zCoord;
-
-			MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent(this));
-
-			addedToEnet = true;
-		}
-	}
-
-	/**
-	 * Forward for the base TileEntity's invalidate(), used for destroying the energy net link.
-	 * Both invalidate and onChunkUnload have to be used.
-	 */
-	@Override
-	public void invalidate() {
-		super.invalidate();
-
-		onChunkUnload();
-	}
-
-	/**
-	 * Forward for the base TileEntity's onChunkUnload(), used for destroying the energy net link.
-	 * Both invalidate and onChunkUnload have to be used.
-	 */
-	@Override
-	public void onChunkUnload() {
-		if (addedToEnet &&
-				Info.isIc2Available()) {
-			MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(this));
-
-			addedToEnet = false;
-		}
-	}
-
-	/**
-	 * Forward for the base TileEntity's readFromNBT(), used for loading the state.
-	 * 
-	 * @param tag Compound tag as supplied by TileEntity.readFromNBT()
-	 */
-	@Override
-	public void readFromNBT(NBTTagCompound tag) {
-		super.readFromNBT(tag);
-
-		NBTTagCompound data = tag.getCompoundTag("IC2BasicSource");
-
-		energyStored = data.getDouble("energy");
-	}
-
-	/**
-	 * Forward for the base TileEntity's writeToNBT(), used for saving the state.
-	 * 
-	 * @param tag Compound tag as supplied by TileEntity.writeToNBT()
-	 */
-	@Override
-	public void writeToNBT(NBTTagCompound tag) {
-		try {
-			super.writeToNBT(tag);
-		} catch (RuntimeException e) {
-			// happens if this is a delegate, ignore
-		}
-
-		NBTTagCompound data = new NBTTagCompound();
-
-		data.setDouble("energy", energyStored);
-
-		tag.setTag("IC2BasicSource", data);
-	}
-
-	// << in-world te forwards
-	// methods for using this adapter >>
-
-	/**
-	 * Get the maximum amount of energy this source can hold in its buffer.
-	 * 
-	 * @return Capacity in EU.
-	 */
-	public double getCapacity() {
-		return capacity;
-	}
-
-	/**
-	 * Set the maximum amount of energy this source can hold in its buffer.
-	 * 
-	 * @param capacity1 Capacity in EU.
-	 */
-	public void setCapacity(double capacity1) {
-		if (capacity1 < power) capacity1 = power;
-
-		this.capacity = capacity1;
-	}
-
-	/**
-	 * Get the IC2 energy tier for this source.
-	 * 
-	 * @return IC2 Tier.
-	 */
-	public int getTier() {
-		return tier;
-	}
-
-	/**
-	 * Set the IC2 energy tier for this source.
-	 * 
-	 * @param tier1 IC2 Tier.
-	 */
-	public void setTier(int tier1) {
-		double power = EnergyNet.instance.getPowerFromTier(tier1);
-
-		if (capacity < power) capacity = power;
-
-		this.tier = tier1;
-		this.power = power;
-	}
-
-
-	/**
-	 * Determine the energy stored in the source's output buffer.
-	 * 
-	 * @return amount in EU
-	 */
-	public double getEnergyStored() {
-		return energyStored;
-	}
-
-	/**
-	 * Set the stored energy to the specified amount.
-	 * 
-	 * This is intended for server -> client synchronization, e.g. to display the stored energy in
-	 * a GUI through getEnergyStored().
-	 * 
-	 * @param amount
-	 */
-	public void setEnergyStored(double amount) {
-		energyStored = amount;
-	}
-
-	/**
-	 * Determine the free capacity in the source's output buffer.
-	 * 
-	 * @return amount in EU
-	 */
-	public double getFreeCapacity() {
-		return capacity - energyStored;
-	}
-
-	/**
-	 * Add some energy to the output buffer.
-	 * 
-	 * @param amount maximum amount of energy to add
-	 * @return amount added/used, NOT remaining
-	 */
-	public double addEnergy(double amount) {
-		if (FMLCommonHandler.instance().getEffectiveSide().isClient()) return 0;
-		if (amount > capacity - energyStored) amount = capacity - energyStored;
-
-		energyStored += amount;
-
-		return amount;
-	}
-
-	/**
-	 * Charge the supplied ItemStack from this source's energy buffer.
-	 * 
-	 * @param stack ItemStack to charge (null is ignored)
-	 * @return true if energy was transferred
-	 */
-	public boolean charge(ItemStack stack) {
-		if (stack == null || !Info.isIc2Available()) return false;
-
-		double amount = ElectricItem.manager.charge(stack, energyStored, tier, false, false);
-
-		energyStored -= amount;
-
-		return amount > 0;
-	}
-
-	// << methods for using this adapter
-
-	// backwards compatibility (ignore these) >>
-
-	@Deprecated
-	public void onUpdateEntity() {
-		updateEntity();
-	}
-
-	@Deprecated
-	public void onInvalidate() {
-		invalidate();
-	}
-
-	@Deprecated
-	public void onOnChunkUnload() {
-		onChunkUnload();
-	}
-
-	@Deprecated
-	public void onReadFromNbt(NBTTagCompound tag) {
-		readFromNBT(tag);
-	}
-
-	@Deprecated
-	public void onWriteToNbt(NBTTagCompound tag) {
-		writeToNBT(tag);
-	}
-
-	// << backwards compatibility
-
-	// ******************************
-	// *** Methods for use by ic2 ***
-	// ******************************
-
-	// energy net interface >>
-
-	@Override
-	public boolean emitsEnergyTo(TileEntity receiver, ForgeDirection direction) {
-		return true;
-	}
-
-	@Override
-	public double getOfferedEnergy() {
-		return Math.min(energyStored, power);
-	}
-
-	@Override
-	public void drawEnergy(double amount) {
-		energyStored -= amount;
-	}
-
-	@Override
-	public int getSourceTier() {
-		return tier;
-	}
-
-	// << energy net interface
-
-
-	public final TileEntity parent;
-
-	protected double capacity;
-	protected int tier;
-	protected double power;
-	protected double energyStored;
-	protected boolean addedToEnet;
-}

src/main/java/api/java/ic2/api/energy/prefab/package-info.java

@@ -1,4 +0,0 @@
-@API(apiVersion="1.0", owner="IC2", provides="IC2API")
-package ic2.api.energy.prefab;
-import cpw.mods.fml.common.API;
-

src/main/java/api/java/ic2/api/energy/tile/IEnergyAcceptor.java

@@ -1,27 +0,0 @@
-package ic2.api.energy.tile;
-
-import net.minecraft.tileentity.TileEntity;
-
-import net.minecraftforge.common.util.ForgeDirection;
-
-/**
- * For internal/multi-block usage only.
- *
- * @see IEnergySink
- * @see IEnergyConductor
- * 
- * See ic2/api/energy/usage.txt for an overall description of the energy net api.
- */
-public interface IEnergyAcceptor extends IEnergyTile {
-	/**
-	 * Determine if this acceptor can accept current from an adjacent emitter in a direction.
-	 * 
-	 * The TileEntity in the emitter parameter is what was originally added to the energy net,
-	 * which may be normal in-world TileEntity, a delegate or an IMetaDelegate.
-	 * 
-	 * @param emitter energy emitter, may also be null or an IMetaDelegate
-	 * @param direction direction the energy is being received from
-	 */
-	boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction);
-}
-

src/main/java/api/java/ic2/api/energy/tile/IEnergyConductor.java

@@ -1,53 +0,0 @@
-package ic2.api.energy.tile;
-
-/**
- * Tile entities which conduct energy pulses without buffering (mostly cables) have to implement this
- * interface.
- * 
- * See ic2/api/energy/usage.txt for an overall description of the energy net api.
- */
-public interface IEnergyConductor extends IEnergyAcceptor, IEnergyEmitter {
-	/**
-	 * Energy loss for the conductor in EU per block.
-	 * 
-	 * @return Energy loss
-	 */
-	double getConductionLoss();
-
-	/**
-	 * Amount of energy the insulation will handle before shocking nearby players and mobs.
-	 * 
-	 * @return Insulation energy absorption in EU
-	 */
-	double getInsulationEnergyAbsorption();
-
-	/**
-	 * Amount of energy the insulation will handle before it is destroyed.
-	 * Ensure that this value is greater than the insulation energy absorption + 64.
-	 *
-	 * @return Insulation-destroying energy in EU
-	 */
-	double getInsulationBreakdownEnergy();
-
-	/**
-	 * Amount of energy the conductor will handle before it melts.
-	 * 
-	 * @return Conductor-destroying energy in EU
-	 */
-	double getConductorBreakdownEnergy();
-
-	/**
-	 * Remove the conductor's insulation if the insulation breakdown energy was exceeded.
-	 * 
-	 * @see #getInsulationBreakdownEnergy()
-	 */
-	void removeInsulation();
-
-	/**
-	 * Remove the conductor if the conductor breakdown energy was exceeded.
-	 * 
-	 * @see #getConductorBreakdownEnergy()
-	 */
-	void removeConductor();
-}
-

src/main/java/api/java/ic2/api/energy/tile/IEnergyEmitter.java

@@ -1,28 +0,0 @@
-package ic2.api.energy.tile;
-
-import net.minecraft.tileentity.TileEntity;
-
-import net.minecraftforge.common.util.ForgeDirection;
-
-/**
- * For internal/multi-block usage only.
- *
- * @see IEnergySource
- * @see IEnergyConductor
- * 
- * See ic2/api/energy/usage.txt for an overall description of the energy net api.
- */
-public interface IEnergyEmitter extends IEnergyTile {
-	/**
-	 * Determine if this emitter can emit energy to an adjacent receiver.
-	 * 
-	 * The TileEntity in the receiver parameter is what was originally added to the energy net,
-	 * which may be normal in-world TileEntity, a delegate or an IMetaDelegate.
-	 * 
-	 * @param receiver receiver, may also be null or an IMetaDelegate
-	 * @param direction direction the receiver is from the emitter
-	 * @return Whether energy should be emitted
-	 */
-	boolean emitsEnergyTo(TileEntity receiver, ForgeDirection direction);
-}
-

src/main/java/api/java/ic2/api/energy/tile/IEnergySink.java

@@ -1,45 +0,0 @@
-package ic2.api.energy.tile;
-
-import net.minecraftforge.common.util.ForgeDirection;
-
-/**
- * Allows a tile entity (mostly a machine) to receive energy.
- * 
- * See ic2/api/energy/usage.txt for an overall description of the energy net api.
- */
-public interface IEnergySink extends IEnergyAcceptor {
-	/**
-	 * Determine how much energy the sink accepts.
-	 *
-	 * Make sure that injectEnergy() does accepts energy if demandsEnergy() returns anything > 0.
-	 * 
-	 * @note Modifying the energy net from this method is disallowed.
-	 *
-	 * @return max accepted input in eu
-	 */
-	double getDemandedEnergy();
-
-	/**
-	 * Determine the tier of this energy sink.
-	 * 1 = LV, 2 = MV, 3 = HV, 4 = EV etc.
-	 * 
-	 * @note Modifying the energy net from this method is disallowed.
-	 * @note Return Integer.MAX_VALUE to allow any voltage.
-	 *
-	 * @return tier of this energy sink
-	 */
-	int getSinkTier();
-
-	/**
-	 * Transfer energy to the sink.
-	 * 
-	 * It's highly recommended to accept all energy by letting the internal buffer overflow to
-	 * increase the performance and accuracy of the distribution simulation.
-	 *
-	 * @param directionFrom direction from which the energy comes from
-	 * @param amount energy to be transferred
-	 * @return Energy not consumed (leftover)
-	 */
-	double injectEnergy(ForgeDirection directionFrom, double amount, double voltage);
-}
-

src/main/java/api/java/ic2/api/energy/tile/IEnergySource.java

@@ -1,38 +0,0 @@
-package ic2.api.energy.tile;
-
-/**
- * Allows a tile entity (mostly a generator) to emit energy.
- * 
- * See ic2/api/energy/usage.txt for an overall description of the energy net api.
- */
-public interface IEnergySource extends IEnergyEmitter {
-	/**
-	 * Energy output provided by the source this tick.
-	 * This is typically Math.min(stored energy, max output/tick).
-	 * 
-	 * @note Modifying the energy net from this method is disallowed.
-	 * 
-	 * @return Energy offered this tick
-	 */
-	double getOfferedEnergy();
-
-	/**
-	 * Draw energy from this source's buffer.
-	 * 
-	 * If the source doesn't have a buffer, this is a no-op.
-	 * 
-	 * @param amount amount of EU to draw, may be negative
-	 */
-	void drawEnergy(double amount);
-
-	/**
-	 * Determine the tier of this energy source.
-	 * 1 = LV, 2 = MV, 3 = HV, 4 = EV etc.
-	 * 
-	 * @note Modifying the energy net from this method is disallowed.
-	 *
-	 * @return tier of this energy source
-	 */
-	int getSourceTier();
-}
-

src/main/java/api/java/ic2/api/energy/tile/IEnergyTile.java

@@ -1,15 +0,0 @@
-package ic2.api.energy.tile;
-
-/**
- * For internal usage only, base class for all energy tiles.
- *
- * @see IEnergySink
- * @see IEnergySource
- * @see IEnergyConductor
- * 
- * See ic2/api/energy/usage.txt for an overall description of the energy net api.
- */
-public interface IEnergyTile {
-	//
-}
-

src/main/java/api/java/ic2/api/energy/tile/IHeatSource.java

@@ -1,23 +0,0 @@
-package ic2.api.energy.tile;
-
-import net.minecraftforge.common.util.ForgeDirection;
-
-public interface IHeatSource {
-	
-	/*
-	 *  Return max heat transmission peer Tick (only theoretical bandwidth not available amount)
-	 */
-	int  maxrequestHeatTick(ForgeDirection directionFrom);
-	
-	/*
-	 * @param requested amount of heat to transfer
-	 * 
-	 * @return transmitted amount of heat
-	 * 
-	 * example: You Request 100 units of heat but the Source have only 50 units left
-	 * 
-	 * requestHeat(100) : return 50 : so 50 units of heat remove from HeatSource
-	 */
-	
-	int requestHeat(ForgeDirection directionFrom, int requestheat);
-}

src/main/java/api/java/ic2/api/energy/tile/IKineticSource.java

@@ -1,22 +0,0 @@
-package ic2.api.energy.tile;
-
-import net.minecraftforge.common.util.ForgeDirection;
-
-public interface IKineticSource {
-	/*
-	 *  Return max kinetic energy transmission peer Tick (only theoretical bandwidth not available amount)
-	 */
-	int  maxrequestkineticenergyTick(ForgeDirection directionFrom);
-
-	/*
-	 * @param requested amount of kinetic energy to transfer
-	 * 
-	 * @return transmitted amount of kineticenergy
-	 * 
-	 * example: You Request 100 units of kinetic energy but the Source have only 50 units left
-	 * 
-	 * requestkineticenergy(100) : return 50 : so 50 units of kinetic energy remove from KineticSource
-	 */
-
-	int requestkineticenergy(ForgeDirection directionFrom, int requestkineticenergy);
-}

src/main/java/api/java/ic2/api/energy/tile/IMetaDelegate.java

@@ -1,36 +0,0 @@
-package ic2.api.energy.tile;
-
-import java.util.List;
-
-import net.minecraft.tileentity.TileEntity;
-
-/**
- * Interface for grouping multi-block structures to a single energy net delegate.
- * 
- * The energy net uses TileEntity to refer to a specific xyz+world position. If multiple of those
- * positions should belong to the same functional structure, i.e. they consume or produce energy
- * only once for the whole multi-block instead of once per every single block, this interface
- * allows to do so.
- * 
- * The tile entity implementing IMetaDelegate has to be added/removed to/from the energy net
- * instead of every single sub-TileEntity. The energy net interaction will be handled by the
- * IMetaDelegate TileEntity as well.
- * 
- * The sub tile array TileEntity[] just provides optional connectivity (IEnergyAcceptor,
- * IEnergyEmitter) and mandatory position (x, y, z, World) data.
- * If the connectivity data on the sub tile is missing, the meta delegate is queried instead.
- * 
- * See ic2/api/energy/usage.txt for an overall description of the energy net api.
- */
-public interface IMetaDelegate extends IEnergyTile {
-	/**
-	 * Get the sub-TileEntities belonging to this Meta TileEntity.
-	 * 
-	 * @note The list has to be consistent between the EnergyNet Load and Unload events.
-	 * @note The list must have at least 1 element.
-	 * @note The parent te implementing IMetaDelegate isn't automatically included.
-	 * 
-	 * @return sub-TileEntity array
-	 */
-	List<TileEntity> getSubTiles();
-}

src/main/java/api/java/ic2/api/energy/tile/package-info.java

@@ -1,4 +0,0 @@
-@API(apiVersion="1.0", owner="IC2", provides="IC2API")
-package ic2.api.energy.tile;
-import cpw.mods.fml.common.API;
-

src/main/java/api/java/ic2/api/energy/usage.txt

@@ -1,144 +0,0 @@
---------------------------------
--- Energy Network Description --
---------------------------------
-
-There are currently three different types of energy network blocks:
-- energy sources, e.g. generators or the output side of a storage block/transformer
-- energy sinks, e.g. machines or the input side of a storage block/transformer
-- conductors, e.g. cables
-
-Note that storage blocks or transformers are both sources and sinks.
-
-All those blocks have to have a tile entity which has to implement the interface corresponding to
-its function and also post events to the Forge event bus.
-
-The energy generation, distribution and consumption is strictly limited to the simulating (server)
-side, use the proper side checks before posting the related events. One possibility is to check for
-FMLCommonHandler.instance().getEffectiveSide().isClient() being false.
-
-The energy network works by calculating the energy flow between the sources which offer energy
-through getOfferedEnergy() and the sinks which request energy through demandedEnergyUnits().
-Conductors will carry the energy over a distance. Once the energy distribution is calculated, the
-energy net will update the sources and sinks through drawEnergy() and injectEnergyUnits() respectively.
-
-
----------------------------
--- Energy Network Events --
----------------------------
-
-The energy network currently requires 2 events to manage its internal representation of the grids:
-
--- EnergyTileLoadEvent --
-
-For all energy network tiles (sources, sinks, conductors) you have to post an EnergyTileLoadEvent.
-
-The event has to be posted as soon as the implementing tile entity is fully loaded, usually after
-loading the chunk which contains it or after the user placing the block.
-
-The energy net implementation will use the event to add it to its energy grid map, taking it into
-account for further energy transfers.
-
-You can detect the loading by either using the 1st iteration of updateEntity() or by waiting for
-the next world tick after TileEntity.validate(). The 2nd approach is obviously more sophisticated
-and requires to use some tick queuing mechanism.
-
-The event can by posted as following:
-  MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent(this));
-
--- EnergyTileUnloadEvent --
-
-Another event every energy tile has to post is the EnergyTileUnloadEvent.
-
-The event has to be posted as soon as the implementing tile entity is being unloaded, either by
-unloading the containing chunk or by destroying the block containing it.
-
-It's possible to detect the unloading by triggering on both the beginning of
-TileEntity.invalidate() and the beginning of TileEntity.onChunkUnload().
-
-It is important that the tile entity is still properly linked to the world while posting the unload
-event, otherwise the energy net can't find all affected connections.
-
-
---------------------------------------
--- Participating Block Requirements --
---------------------------------------
-
-The energy net blocks have to do the following to work properly:
-
--- energy source --
-
-An energy source has to post the following events:
- - EnergyTileLoadEvent on load
- - EnergyTileUnloadEvent on unload
-
-Additionally the interface IEnergySource has to be implemented.
-
--- energy sink --
-
-An energy sink has to post the following events:
- - EnergyTileLoadEvent on load
- - EnergyTileUnloadEvent on unload
-
-Additionally the interface IEnergySink has to be implemented.
-
--- energy conductor --
-
-An energy conductor has to post the following events:
- - EnergyTileLoadEvent on load
- - EnergyTileUnloadEvent on unload
-
-Additionally the interface IEnergyConductor has to be implemented.
-
-
-------------------------------
--- Energy Network Delegates --
-------------------------------
-
-A delegate is a separate object which performs tasks for the original object, in this case handling
-the energy net interaction.
-
-The TileEntity instances used by the events don't have to be the same as the in-world TileEntity
-instance for the corresponding position, it can be delegated to a separate TileEntity instance.
-This separate instance (delegate) needs to have its world and xyz coordinate fields set to match
-the in-world instance. The delegate implements the energy net interfaces and is added and removed
-to/from the energy net through EnergyTileLoadEvent and EnergyTileUnloadEvent.
-
-Separating the interfaces through a delegate allows to isolate the IC2 API usage into separate
-classes an potentially share common code like an input buffer with battery discharging outside the
-class hierarchy.
-It's even possible to use an ic2 energy net delegate alongside an in-world TileEntity which isn't
-designed to work with ic2 energy at all, like making a furnace electric by receiving energy through
-a delegate and adding the corresponding fuel amount to the in-world furnace TileEntity.
-
-Getting the in-world TileEntity for a delegate involves calling World.getBlockTileEntity() with the
-delegate's world and xyz coordinate information.
-
-
-------------------
--- Multi Blocks --
-------------------
-
-Multi blocks are a group of blocks which act as one functional entity. 
-
-The IMetaDelegate interface groups multiple TileEntity instances (=sub tiles) representing the
-individual blocks to a single Energy Net relevant node. The sub tiles may be normal in-world or
-delegate TileEntity instances.
-
-The meta delegate is added to energy net once for the whole multi block structure and implements
-the energy net interfaces as well. The sub tiles may optionally implement IEnergyEmitter and/or
-IEnergyAcceptor to specify their connectivity rules independently, otherwise the meta delegate will
-be queried.
-
-
---------------------------------------------------
--- How to implement/add your own energy network --
---------------------------------------------------
-
-If you want to create an alternative way of distributing energy, e.g. to have different
-distribution rules or to use energy networks provided by other mods, you can register to the energy
-tile events and use the interfaces to handle the energy distribution yourself. It's no longer
-required to use conversion blocks.
-
-IC2's EnergyNet itself is built on top of the api events and interfaces, providing their default
-use case.
-

src/main/java/api/java/ic2/api/event/ExplosionEvent.java

@@ -1,44 +0,0 @@
-package ic2.api.event;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.world.World;
-
-import cpw.mods.fml.common.eventhandler.Cancelable;
-
-import net.minecraftforge.event.world.WorldEvent;
-
-@Cancelable
-public class ExplosionEvent extends WorldEvent {
-	public ExplosionEvent(World world, Entity entity,
-			double x, double y, double z,
-			double power,
-			EntityLivingBase igniter,
-			int radiationRange, double rangeLimit) {
-		super(world);
-
-		this.entity = entity;
-		this.x = x;
-		this.y = y;
-		this.z = z;
-		this.power = power;
-		this.igniter = igniter;
-		this.radiationRange = radiationRange;
-		this.rangeLimit = rangeLimit;
-	}
-
-	/**
-	 * Entity representing the explosive, may be null.
-	 */
-	public final Entity entity;
-	public double x;
-	public double y;
-	public double z;
-	public double power;
-	/**
-	 * Entity causing the explosion, may be null.
-	 */
-	public final EntityLivingBase igniter;
-	public final int radiationRange;
-	public final double rangeLimit;
-}

src/main/java/api/java/ic2/api/event/LaserEvent.java

@@ -1,114 +0,0 @@
-package ic2.api.event;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-import cpw.mods.fml.common.eventhandler.Cancelable;
-
-import net.minecraftforge.event.world.WorldEvent;
-
-/**
- * A bunch of Events to handle the power of the Mining Laser.
- */
-@Cancelable
-public class LaserEvent extends WorldEvent {
-	// the Laser Entity
-	public final Entity lasershot;
-
-	// the following variables can be changed and the Laser will adjust to them
-
-	// the Player firing the Laser. If the Laser gets "reflected" the Player could change.
-	public EntityLivingBase owner;
-	// Range of the Laser Shot. Determine the amount of broken blocks, as well, as each broken block will subtract ~1F from range.
-	public float range, power;
-	public int blockBreaks;
-	// Determines whether the laser will explode upon hitting something
-	public boolean explosive, smelt;
-
-	public LaserEvent(World world1, Entity lasershot1, EntityLivingBase owner1, float range1, float power1, int blockBreaks1, boolean explosive1, boolean smelt1) {
-		super(world1);
-		this.lasershot = lasershot1;
-		this.owner = owner1;
-		this.range = range1;
-		this.power = power1;
-		this.blockBreaks = blockBreaks1;
-		this.explosive = explosive1;
-		this.smelt = smelt1;
-	}
-
-	/**
-	 * Event when the Laser is getting shot by a Player.
-	 * 
-	 * The Item is the Laser Gun which the "Player" has shot
-	 */
-	public static class LaserShootEvent extends LaserEvent {
-		ItemStack laseritem;
-
-		public LaserShootEvent(World world1, Entity lasershot1, EntityLivingBase owner1, float range1, float power1, int blockBreaks1, boolean explosive1, boolean smelt1, ItemStack laseritem1) {
-			super(world1, lasershot1, owner1, range1, power1, blockBreaks1, explosive1, smelt1);
-			this.laseritem = laseritem1;
-		}
-	}
-
-	/**
-	 * Event when the Laser is exploding for some Reason.
-	 * 
-	 * The Laser will no longer exist after this Event is posted as it either Explodes or despawns after the Event is fired.
-	 */
-	public static class LaserExplodesEvent extends LaserEvent {
-		// explosion strength, even that can be changed!
-		public float explosionpower, explosiondroprate, explosionentitydamage;
-
-		public LaserExplodesEvent(World world1, Entity lasershot1, EntityLivingBase owner1, float range1, float power1, int blockBreaks1, boolean explosive1, boolean smelt1, float explosionpower1, float explosiondroprate1, float explosionentitydamage1) {
-			super(world1, lasershot1, owner1, range1, power1, blockBreaks1, explosive1, smelt1);
-			this.explosionpower = explosionpower1;
-			this.explosiondroprate = explosiondroprate1;
-			this.explosionentitydamage = explosionentitydamage1;
-		}
-	}
-
-	/**
-	 * Event when the Laser is hitting a Block
-	 * x, y and z are the Coords of the Block.
-	 * 
-	 * Canceling this Event stops the Laser from attempting to break the Block, what is very useful for Glass.
-	 * Use lasershot.setDead() to remove the Shot entirely.
-	 */
-	public static class LaserHitsBlockEvent extends LaserEvent {
-		// targeted block, even that can be changed!
-		public int x, y, z;
-		public int side;
-		// removeBlock determines if the Block will be removed. dropBlock determines if the Block should drop something.
-		public boolean removeBlock, dropBlock;
-		public float dropChance;
-
-		public LaserHitsBlockEvent(World world1, Entity lasershot1, EntityLivingBase owner1, float range1, float power1, int blockBreaks1, boolean explosive1, boolean smelt1, int x1, int y1, int z1, int side1, float dropChance1, boolean removeBlock1, boolean dropBlock1) {
-			super(world1, lasershot1, owner1, range1, power1, blockBreaks1, explosive1, smelt1);
-			this.x = x1;
-			this.y = y1;
-			this.z = z1;
-			this.side = side1;
-			this.removeBlock = removeBlock1;
-			this.dropBlock = dropBlock1;
-			this.dropChance = dropChance1;
-		}
-	}
-
-	/**
-	 * Event when the Laser is getting at a Living Entity
-	 * 
-	 * Canceling this Event ignores the Entity
-	 * Use lasershot.setDead() to remove the Shot entirely.
-	 */
-	public static class LaserHitsEntityEvent extends LaserEvent {
-		// the Entity which the Laser has shot at, even the target can be changed!
-		public Entity hitentity;
-
-		public LaserHitsEntityEvent(World world1, Entity lasershot1, EntityLivingBase owner1, float range1, float power1, int blockBreaks1, boolean explosive1, boolean smelt1, Entity hitentity1) {
-			super(world1, lasershot1, owner1, range1, power1, blockBreaks1, explosive1, smelt1);
-			this.hitentity = hitentity1;
-		}
-	}
-}

src/main/java/api/java/ic2/api/event/PaintEvent.java

@@ -1,32 +0,0 @@
-package ic2.api.event;
-
-import net.minecraft.world.World;
-
-import cpw.mods.fml.common.eventhandler.Cancelable;
-
-import net.minecraftforge.event.world.WorldEvent;
-
-@Cancelable
-public class PaintEvent extends WorldEvent {
-	// target block
-	public final int x;
-	public final int y;
-	public final int z;
-	public final int side;
-
-	// color to paint the block
-	public final int color;
-
-	// set to true to confirm the operation
-	public boolean painted = false;
-
-	public PaintEvent(World world1, int x1, int y1, int z1, int side1, int color1) {
-		super(world1);
-
-		this.x = x1;
-		this.y = y1;
-		this.z = z1;
-		this.side = side1;
-		this.color = color1;
-	}
-}

src/main/java/api/java/ic2/api/event/RetextureEvent.java

@@ -1,37 +0,0 @@
-package ic2.api.event;
-
-import net.minecraft.block.Block;
-import net.minecraft.world.World;
-
-import cpw.mods.fml.common.eventhandler.Cancelable;
-
-import net.minecraftforge.event.world.WorldEvent;
-
-@Cancelable
-public class RetextureEvent extends WorldEvent {
-	// target block
-	public final int x;
-	public final int y;
-	public final int z;
-	public final int side;
-
-	// referenced block (to grab the texture from)
-	public final Block referencedBlock;
-	public final int referencedMeta;
-	public final int referencedSide;
-
-	// set to true to confirm the operation
-	public boolean applied = false;
-
-	public RetextureEvent(World world1, int x1, int y1, int z1, int side1, Block referencedBlock, int referencedMeta1, int referencedSide1) {
-		super(world1);
-
-		this.x = x1;
-		this.y = y1;
-		this.z = z1;
-		this.side = side1;
-		this.referencedBlock = referencedBlock;
-		this.referencedMeta = referencedMeta1;
-		this.referencedSide = referencedSide1;
-	}
-}

src/main/java/api/java/ic2/api/event/package-info.java

@@ -1,4 +0,0 @@
-@API(apiVersion="1.0", owner="IC2", provides="IC2API")
-package ic2.api.event;
-import cpw.mods.fml.common.API;
-

src/main/java/api/java/ic2/api/info/IEnergyValueProvider.java

@@ -1,17 +0,0 @@
-package ic2.api.info;
-
-import net.minecraft.item.ItemStack;
-
-public interface IEnergyValueProvider {
-	/**
-	 * Determine the energy value for a single item in the supplied stack.
-	 * The value is used by most machines in the discharge slot.
-	 * 
-	 * This only applies to basic single use items, others are to be queried
-	 * through e.g. ElectricItem.manager.getCharge().
-	 * 
-	 * @param itemStack ItemStack containing the item to evaluate.
-	 * @return energy in EU
-	 */
-	double getEnergyValue(ItemStack itemStack);
-}