Fix buildscript (again)

build.gradle

@@ -1,9 +1,14 @@
 buildscript {
     repositories {
         mavenCentral()
+		jcenter()	
+        //maven {
+        //    name = "forge"
+        //    url = "http://files.minecraftforge.net/maven"
+        //}
 		maven {
-            name = "forge"
+			name = "gt"
-            url = "http://files.minecraftforge.net/maven"
+			url = "https://gregtech.overminddl1.com/"
 		}	
         maven {
             name = "sonatype"
@@ -15,10 +20,30 @@ buildscript {
     }
 }
 
-apply plugin: 'forge'
+// Because Forge is too stupid to fix Deprecation Issues, and we cannot fix it on our end! (until we fork Forge)
-apply plugin: 'idea'
+allprojects {
+	tasks.withType(JavaCompile) {
+		options.compilerArgs << "-Xlint:deprecation"
+	}
+}
 
-idea.module.inheritOutputDirs = true
+apply plugin: 'eclipse'
+eclipse {
+	classpath {
+		downloadJavadoc = true
+		downloadSources = true
+	}
+}
+
+apply plugin: 'idea'
+idea{
+	module {
+		downloadJavadoc = true
+		downloadSources = true
+	}
+}
+
+apply plugin: 'forge'
 
 file "build.properties" withReader {
     def prop = new Properties()
@@ -26,24 +51,24 @@ file "build.properties" withReader {
     ext.config = new ConfigSlurper().parse prop
 }
 
-allprojects {
-	tasks.withType(JavaCompile) {
-		options.compilerArgs << "-Xlint:deprecation"
-	}
-}
-
 version = "${config.gt.version}"
 group= "gregtech"
 archivesBaseName = "gregtech"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
+compileJava.options.bootClasspath = org.gradle.internal.jvm.Jvm.current().getJre().getHomeDir().toString() +"/lib/rt.jar"
+compileJava {
+	options.encoding = "UTF-8"
+}
 
 minecraft {
     version = "${config.minecraft.version}-${config.forge.version}"
     runDir = "eclipse"
 }
 
+idea { module { inheritOutputDirs = true } }
+
 configurations {
     provided
     embedded
@@ -51,41 +76,21 @@ configurations {
 }
 
 repositories {
-    //maven {
-    //    name 'Forge'
-    //    url 'http://files.minecraftforge.net/maven'
-    //}
 	maven {
 		name = "gt"
-	url = "https://gregtech.overminddl1.com/"
+		url = "http://gregtech.overminddl1.com/"
 	}
 	maven {
-        name = "chickenbones"
+		name = "ic2"
-        url = "http://chickenbones.net/maven/"
-    }
-    maven {
-        name = "ic2, forestry"
 		url = "http://maven.ic2.player.to/"
 	}
-    maven { // EnderIO & EnderCore
-        name 'tterrag Repo'
-        url "http://maven.tterrag.com"
-    }
-    maven { // AppleCore
-        url "http://www.ryanliptak.com/maven/"
-    }
-    maven {
-    	name = "Covers (COFH)"
-    	url = "http://maven.covers1624.net/"
-    }
-    maven {
-	name = "local"
-	url = "file:///C:/Users/michael/Documents/forge/maven/"
-    }
 }
 
 dependencies {
-        compile "ic2:IC2Classic:1.2.1.8:dev"
+//    compile fileTree(dir: 'libs', include: '*.jar')
+
+	// Mostly Used for compileOnly, if you prefer normal IC2, uncomment it instead.
+   	provided "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev" 
     
 	compile "mcp.mobius.waila:Waila:1.5.11-RC2-NONEI_1.7.10:dev"
 	compile "codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev"
@@ -110,6 +115,7 @@ dependencies {
 	compileOnly "appeng:appliedenergistics2:rv3-beta-6:dev"	
 	compileOnly "applecore:AppleCore:1.7.10-3.1.1:deobf"
 	compileOnly "com.shedar.IC2NuclearControl:IC2NuclearControl:2.4.3a:dev"
+    
 }
 
 processResources
@@ -118,34 +124,35 @@ processResources
     inputs.property "version", project.version
     inputs.property "mcversion", project.minecraft.version
 
-    ext.srcFiles = "$projectDir/src/main/resources"
-    ext.destDir = "$projectDir/build/classes/main"
-
-    // registering inputs & outputs allow gradle to skip if UP-TO-DATE
-    inputs.files srcFiles
-    outputs.dir destDir
-
-    println 'starting processResources'
-    println 'srcFiles: ' + srcFiles
-    println 'destDir: ' + destDir
-
-
-    copy {
     // replace stuff in mcmod.info, nothing else
-        from(srcFiles)
+    from(sourceSets.main.resources.srcDirs) {
-        into(destDir)
         include 'mcmod.info'
-            // replace version and mcversion
-        expand 'version': project.version, 'mcversion': project.minecraft.version
                 
+        // replace version and mcversion
+        expand 'version':project.version, 'mcversion':project.minecraft.version
     }
         
-
-    copy {
     // copy everything else, thats not the mcmod.info
-        from(srcFiles)
+    from(sourceSets.main.resources.srcDirs) {
-        into(destDir)
         exclude 'mcmod.info'
+    }
+	exclude '**/Thumbs.db'
+}
 
+task sourceJar(type: Jar) {
+    from sourceSets.main.allSource
+    classifier = 'sources'
+}
+
+task devJar(type: Jar) {
+    from sourceSets.main.output
+    classifier = 'dev'
+    manifest {
+        //attributes 'FMLCorePlugin': 'WhateverLoaderClass'
+        //attributes 'FMLCorePluginContainsFMLMod': 'true'
     }
 }
+
+artifacts {
+    archives devJar
+}

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.2-bin.zip