PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-25 13:57:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

FG is broken :(

Browse source
This commit is contained in:
Matthew Messinger 2019-05-17 00:04:58 -04:00
parent bb2c21dd10
commit 8fbc5bbf20
3 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
build.gradle
View file

@ -55,17 +55,12 @@ sourceSets {
compileClasspath += main.compileClasspath compileClasspath += main.compileClasspath
compileClasspath += main.output compileClasspath += main.output
} }
main {
}
fml { fml {
compileClasspath += main.compileClasspath compileClasspath += main.compileClasspath
compileClasspath += main.output compileClasspath += main.output
compileClasspath += client.output compileClasspath += client.output
} }
// TODO: Disable the hidden "test" sourceset
// TODO: Disable the resources folders for sourcesets that don't need them
} }
minecraft { minecraft {
@ -80,11 +75,10 @@ minecraft {
mods { mods {
minelittlepony { minelittlepony {
// TODO: Remember to add /bin/default to the Environment configs
// minelittlepony%%C:/.../bin/default
source sourceSets.fml source sourceSets.fml
} }
} }
ideaModule = "${project.name}.fml"
} }
} }
} }
@ -99,8 +93,6 @@ repositories {
} }
dependencies { 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 minecraft "net.minecraftforge:forge:" + project.minecraft_version + "-" + project.forge_version
@ -108,12 +100,8 @@ dependencies {
transitive = false transitive = false
} }
compile "com.github.MineLittlePony:Kirin:master-SNAPSHOT:base" compile fg.deobf("com.github.MineLittlePony:Kirin:master-SNAPSHOT")
compile "com.github.MineLittlePony:HDSkins:1.13-SNAPSHOT:base" compile fg.deobf("com.github.MineLittlePony:HDSkins:1.13-SNAPSHOT")
//
// compile(project(':HDSkins')) {
// transitive = false
// }
} }
compileJava.options.compilerArgs += '-proc:none' compileJava.options.compilerArgs += '-proc:none'
@ -129,9 +117,6 @@ jar {
from sourceSets.main.output from sourceSets.main.output
from sourceSets.client.output from sourceSets.client.output
from sourceSets.fml.output from sourceSets.fml.output
classifier 'base'
extension 'jar'
} }
// //

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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

2
settings.gradle
View file

@ -1,3 +1,3 @@
rootProject.name = 'MineLittlePony' rootProject.name = 'MineLittlePony'
// Checkout to parent dir to dev both // Checkout to parent dir to dev both
includeBuild '../HDSkins' //includeBuild '../HDSkins'