Merge branch 'master-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8

build.gradle

@@ -1,22 +1,19 @@
+// For those who want the bleeding edge
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
         maven {
             name = "forge"
             url = "http://files.minecraftforge.net/maven"
         }
-        maven {
-            name = "sonatype"
-            url = "https://oss.sonatype.org/content/repositories/snapshots/"
-        }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.0-SNAPSHOT'
     }
 }
 
 apply plugin: 'scala'
-apply plugin: 'forge'
+apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'idea'
 apply plugin: 'maven-publish'
 
@@ -193,7 +190,7 @@ dependencies {
     provided "codechicken:CodeChickenCore:${config.minecraft.version}-${config.ccc.version}:dev"
     provided "codechicken:CodeChickenLib:${config.minecraft.version}-${config.ccl.version}:dev"
     provided "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:dev"
-    provided "mcp.mobius.waila:Waila:${config.waila.version}:dev"
+    provided "mcp.mobius.waila:Waila:${config.waila.version}"
 /*
     provided "appeng:RotaryCraft:${config.rotc.version}:api"
     provided ("appeng:appliedenergistics2:${config.ae2.version}:dev") {
@@ -312,42 +309,23 @@ processResources {
     rename '(.+_at.cfg)', 'META-INF/$1'
 }
 
-def commonManifest = {
+jar {
+    configurations.embedded.each { dep ->
+        from(project.zipTree(dep)) {
+            exclude 'META-INF', 'META-INF/**'
+        }
+    }
+    manifest {
         attributes FMLCorePlugin: "li.cil.oc.common.launch.TransformerLoader"
         attributes FMLCorePluginContainsFMLMod: "true"
         attributes FMLAT: "oc_at.cfg"
     }
-
-jar {
-    exclude "cofh/**"
-    exclude "mods/**"
-    configurations.embedded.each { dep ->
-        from(project.zipTree(dep)) {
-            exclude 'META-INF', 'META-INF/**'
-        }
-    }
-    classifier = 'universal'
-    manifest commonManifest
 }
 
 javadoc {
     include 'li/cil/oc/api/**'
 }
 
-// because the normal default jar task has been modified to be obfuscated
-task deobfJar(type: Jar) {
-    from sourceSets.main.output
-    exclude "cofh/**"
-    exclude "mods/**"
-    configurations.embedded.each { dep ->
-        from(project.zipTree(dep)) {
-            exclude 'META-INF', 'META-INF/**'
-        }
-    }
-    classifier = 'dev'
-    manifest commonManifest
-}
-
 task apiJar(type: Jar) {
     from sourceSets.main.output
     from sourceSets.main.java
@@ -367,7 +345,6 @@ task sourcesJar(type: Jar) {
 }
 
 artifacts {
-    archives deobfJar
     archives apiJar
     archives javadocJar
     archives sourcesJar
@@ -380,7 +357,6 @@ publishing {
             artifact apiJar
             artifact javadocJar
             artifact sourcesJar
-            artifact deobfJar { classifier 'dev' }
         }
     }
     repositories {

build.properties

@@ -1,5 +1,5 @@
 minecraft.version=1.8
-forge.version=11.14.3.1450
+forge.version=11.14.4.1563
 
 oc.version=1.5.21
 oc.subversion=

src/main/scala/li/cil/oc/common/tileentity/traits/StateAware.scala

@@ -4,13 +4,12 @@ import java.util
 
 import li.cil.oc.common.asm.Injectable
 import li.cil.oc.integration.Mods
+import net.minecraftforge.fml.common.Optional
 
 @Injectable.Interface(value = "buildcraft.api.tiles.IHasWork", modid = Mods.IDs.BuildCraft)
 trait StateAware {
   def currentState: util.EnumSet[State]
 
-/* TODO BuildCraft
   @Optional.Method(modid = Mods.IDs.BuildCraft)
   def hasWork: Boolean = currentState.contains(State.CanWork) || currentState.contains(State.IsWorking)
-*/
 }