Merged in AlkWork (pull request #4)

AlkWork

1 files changed, 46 insertions, 27 deletions

diff --git a/build.gradle b/build.gradle
index ab5fec70de..fb19efaab6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,6 @@
 buildscript {
     repositories {
+		mavenLocal()
         mavenCentral()
 		jcenter()	
         //maven {
@@ -20,8 +21,8 @@ buildscript {
     }
     dependencies {
         classpath "net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT"
-		classpath 'net.sf.proguard:proguard-gradle:6.2.2'
 		//classpath "gradle.plugin.se.bjurr.gitchangelog:git-changelog-gradle-plugin:1.55"
+		classpath 'net.sf.proguard:proguard-gradle:6.2.2'
     }
 }
 
@@ -81,7 +82,10 @@ compileJava.options.encoding = 'UTF-8'
 
 minecraft {
     version = "${config.minecraft.version}-${config.forge.version}"
-    runDir = "eclipse"
+    runDir = "eclipse"    
+    srgExtra "PK: org/dom4j gtpp/shaded/org/dom4j"
+    srgExtra "PK: org/javassist gtpp/shaded/org/javassist"
+    srgExtra "PK: org/reflections/reflections gtpp/shaded/org/reflections"
 }
 
 idea { module { inheritOutputDirs = true } }
@@ -89,7 +93,8 @@ idea { module { inheritOutputDirs = true } }
 configurations {
     provided
     embedded
-    compile.extendsFrom provided, embedded
+    shade
+    compile.extendsFrom provided, embedded, shade
 }
 
 repositories {
@@ -110,8 +115,35 @@ sourceSets {
     }
 }
 
+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 'version':project.version, 'mcversion':project.minecraft.version
+    }
+        
+    // copy everything else, thats not the mcmod.info
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
+    }
+	exclude '**/Thumbs.db'
+}
+
 dependencies {	
     
+    // Used for productive reflection without class loading. (0.9.12 has no reliance on Guava either)
+	//shade group: 'org.reflections', name: 'reflections', version: '0.9.12'
+	//shade group: 'org.dom4j', name: 'dom4j', version: '2.1.1'
+	//compile group: 'org.javassist', name: 'javassist', version: '3.26.0-GA'
+    
+    
     //compile files('libs/gregtech-5.08.33-dev.jar')
     compile files('libs/gregtech-5.09.31-dev.jar')
 
@@ -122,7 +154,9 @@ dependencies {
 	compile "codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev"
 	compile "codechicken:CodeChickenCore:1.7.10-1.0.7.47:dev"
 	compile "codechicken:NotEnoughItems:1.7.10-1.0.5.120:dev"
-    compile files('libs/PlayerAPI-1.7.10-1.4.jar')
+    compile "api.player:PlayerAPI:1.7.10-1.4"
+	
+	compile "minetweaker:MineTweaker3:1.7.10-3.0.10:dev-full"
 	
 	compile "com.enderio.core:EnderCore:1.7.10-0.2.0.39_beta:dev"
 	compile "com.enderio:EnderIO:1.7.10-2.3.0.430_beta:dev"
@@ -136,40 +170,25 @@ dependencies {
     compileOnly "openmods:OpenModsLib:1.7.10-0.10:deobf"
     compileOnly "openblocks:OpenBlocks:1.7.10-1.6-1.7.10:deobf"
 	
-	//compileOnly "micdoodle8.mods:GalacticraftCore:1.7-3.0.12.504:Dev"
 	//compileOnly "micdoodle8.mods:MicdoodleCore:1.7-3.0.12.504:Dev"
+	//compileOnly "micdoodle8.mods:GalacticraftCore:1.7-3.0.12.504:Dev"
+	//compileOnly "micdoodle8.mods:Galacticraft-Planets:1.7-3.0.12.504:Dev"	
 	
 	compileOnly "thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev"	
 	compile "com.azanor.baubles:Baubles:1.7.10-1.0.1.10:deobf"	
 }
 
-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 'version':project.version, 'mcversion':project.minecraft.version
-    }
-        
-    // copy everything else, thats not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
-    }
-	exclude '**/Thumbs.db'
-}
-
 jar {
     archiveName = archivesBaseName + "-" + version + ".jar"
     manifest {
         attributes 'FMLCorePlugin': 'gtPlusPlus.preloader.asm.Preloader_FMLLoadingPlugin'
         attributes 'FMLCorePluginContainsFMLMod': 'true'
     }
+    configurations.shade.each { dep ->
+    	from(project.zipTree(dep)){
+        	exclude 'META-INF', 'META-INF/**'
+    	}
+    }
 }
 
 task generateDictionaries(type: JavaExec) {
@@ -212,7 +231,7 @@ task proguard(type: proguard.gradle.ProGuardTask) {
 build.finalizedBy(generateDictionaries)
 
 // Obfuscate this bitch.
-//build.finalizedBy(proguard) // Disabled until optimization is working 100%
+build.finalizedBy(proguard) // Disabled until optimization is working 100%
 
 //build.finalizedBy(gitChangelogTask)
 //build.finalizedBy(curseChangelogTask)