Merge pull request #425 from GTNewHorizons/appeng_transitivity

Fix issues compiling third party apps

3 files changed, 24 insertions, 21 deletions

diff --git a/build.gradle b/build.gradle
index 4ed676b8c4..fc159f61f6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,9 +9,13 @@ buildscript {
             name = "sonatype"
             url = "https://oss.sonatype.org/content/repositories/snapshots/"
         }
+        maven {
+            name = "jitpack.io"
+            url = "https://jitpack.io"
+        }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+        classpath 'com.github.GTNH2:ForgeGradle:FG_1.2-SNAPSHOT'
     }
 }
 
@@ -19,6 +23,7 @@ apply plugin: 'forge'
 apply plugin: 'idea'
 apply plugin: 'java'
 apply plugin: 'signing'
+apply plugin: 'java-library'
 
 file "build.properties" withReader {
     def prop = new Properties()
@@ -82,34 +87,32 @@ repositories {
 }
 
 dependencies {
-    compileOnly "eu.usrv:YAMCore:${config.minecraft.version}-${config.yamcore.version}:deobf"
-    compileOnly "tconstruct:TConstruct:${config.minecraft.version}-${config.tconstruct.version}:deobf"
-	//compile "mantle:Mantle:${config.minecraft.version}-${config.mantle.version}:deobf"
-    compileOnly ("appeng:appliedenergistics2:${config.ae2.version}:dev") {
-        exclude module: '*'
-    }
-    compileOnly "codechicken:CodeChickenLib:${config.minecraft.version}-${config.codechickenlib.version}:dev"
-    compileOnly "codechicken:CodeChickenCore:${config.minecraft.version}-${config.codechickencore.version}:dev"
-    compileOnly "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:dev"
-    compileOnly "codechicken:Translocator:${config.minecraft.version}-${config.translocators.version}:dev"
+    //Hard dep to start (Without this, it wont compile nor start)
     compile "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev"
-    compileOnly "net.sengir.forestry:forestry_${config.minecraft.version}:${config.forestry.version}:dev"
-    compileOnly "applecore:AppleCore:${config.applecore.version}:api"
-    compileOnly "com.enderio.core:EnderCore:${config.enderiocore.version}:dev"
-    compileOnly ("com.enderio:EnderIO:${config.enderio.version}:dev") {
+
+    //Hard dep to compile (Without this, it wont compile, not even as library)
+    api "appeng:appliedenergistics2:${config.ae2.version}:dev"
+    api "applecore:AppleCore:${config.applecore.version}:api"
+    api "codechicken:CodeChickenLib:${config.minecraft.version}-${config.codechickenlib.version}:dev"
+    api "codechicken:CodeChickenCore:${config.minecraft.version}-${config.codechickencore.version}:dev"
+    api "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:dev"
+    api "com.enderio.core:EnderCore:${config.enderiocore.version}:dev"
+    api ("com.enderio:EnderIO:${config.enderio.version}:dev"){
         transitive = false
     }
+
+    //Soft Depths (Without this, it wont compile, not needed as library)
+    compileOnly "eu.usrv:YAMCore:${config.minecraft.version}-${config.yamcore.version}:deobf"
+    compileOnly "tconstruct:TConstruct:${config.minecraft.version}-${config.tconstruct.version}:deobf"
+	compileOnly "codechicken:Translocator:${config.minecraft.version}-${config.translocators.version}:dev"
+    compileOnly "net.sengir.forestry:forestry_${config.minecraft.version}:${config.forestry.version}:dev"
     compileOnly files("libs/Galacticraft-API-1.7-${config.gc.version}.jar")
     compileOnly files("libs/GalacticraftCore-Dev-${config.gc.version}.jar")
     compileOnly name: "Galacticraft-API", version: config.gc.version, ext: 'jar'
     compileOnly name: "GalacticraftCore-Dev", version: config.gc.version, ext: 'jar'
     compileOnly name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar'
-  //compileOnly name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar'
     compileOnly name: 'Railcraft', version: config.railcraft.version, ext: 'jar'
     compileOnly name: 'IC2NuclearControl', version: config.nc.version, ext: 'jar'
-
-  //provided name: 'ImmersiveEngineering', version: config.immeng.version, ext: 'jar'
-  //provided name: 'magneticraft', version: config.magneticraft.version, ext: 'jar'
 }
 
 processResources
diff --git a/build.properties b/build.properties
index b1c494211b..9aa6c31cf7 100644
--- a/build.properties
+++ b/build.properties
@@ -16,7 +16,7 @@ enderiocore.version=1.7.10-0.1.0.25_beta
 forestry.version=4.2.10.58
 gc.version=1.7-3.0.12.504
 ic2.version=2.2.790-experimental
-nei.version=1.0.3.57
+nei.version=1.0.5.111
 railcraft.cf=2299/713
 railcraft.version=1.7.10-9.12.2.0
 nc.cf=2275/987
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2c2bbe5f9a..674bdda00e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip