mirror of
https://github.com/MineLittlePony/MineLittlePony.git
synced 2024-11-21 20:18:01 +01:00
FG is broken :(
This commit is contained in:
parent
bb2c21dd10
commit
8fbc5bbf20
3 changed files with 5 additions and 20 deletions
21
build.gradle
21
build.gradle
|
@ -55,17 +55,12 @@ sourceSets {
|
|||
compileClasspath += main.compileClasspath
|
||||
compileClasspath += main.output
|
||||
}
|
||||
main {
|
||||
}
|
||||
|
||||
fml {
|
||||
compileClasspath += main.compileClasspath
|
||||
compileClasspath += main.output
|
||||
compileClasspath += client.output
|
||||
}
|
||||
|
||||
// TODO: Disable the hidden "test" sourceset
|
||||
// TODO: Disable the resources folders for sourcesets that don't need them
|
||||
}
|
||||
|
||||
minecraft {
|
||||
|
@ -80,11 +75,10 @@ minecraft {
|
|||
|
||||
mods {
|
||||
minelittlepony {
|
||||
// TODO: Remember to add /bin/default to the Environment configs
|
||||
// minelittlepony%%C:/.../bin/default
|
||||
source sourceSets.fml
|
||||
}
|
||||
}
|
||||
ideaModule = "${project.name}.fml"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -99,8 +93,6 @@ repositories {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
// TODO: Add HDSkins as a dependency. It won't compile without it.
|
||||
// TODO: Add KirinUI as a dependency.
|
||||
|
||||
minecraft "net.minecraftforge:forge:" + project.minecraft_version + "-" + project.forge_version
|
||||
|
||||
|
@ -108,12 +100,8 @@ dependencies {
|
|||
transitive = false
|
||||
}
|
||||
|
||||
compile "com.github.MineLittlePony:Kirin:master-SNAPSHOT:base"
|
||||
compile "com.github.MineLittlePony:HDSkins:1.13-SNAPSHOT:base"
|
||||
//
|
||||
// compile(project(':HDSkins')) {
|
||||
// transitive = false
|
||||
// }
|
||||
compile fg.deobf("com.github.MineLittlePony:Kirin:master-SNAPSHOT")
|
||||
compile fg.deobf("com.github.MineLittlePony:HDSkins:1.13-SNAPSHOT")
|
||||
}
|
||||
|
||||
compileJava.options.compilerArgs += '-proc:none'
|
||||
|
@ -129,9 +117,6 @@ jar {
|
|||
from sourceSets.main.output
|
||||
from sourceSets.client.output
|
||||
from sourceSets.fml.output
|
||||
|
||||
classifier 'base'
|
||||
extension 'jar'
|
||||
}
|
||||
|
||||
//
|
||||
|
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -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-4.9-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
rootProject.name = 'MineLittlePony'
|
||||
// Checkout to parent dir to dev both
|
||||
includeBuild '../HDSkins'
|
||||
//includeBuild '../HDSkins'
|
||||
|
|
Loading…
Reference in a new issue