merge common with root

This commit is contained in:
Matthew Messinger 2015-12-08 16:53:08 -05:00
parent 2bb8f7f8ce
commit 903cb3a5eb
5 changed files with 21 additions and 20 deletions

View file

@ -16,15 +16,6 @@ minecraft {
tweakClass = 'com.mumfrey.liteloader.launch.LiteLoaderTweaker' tweakClass = 'com.mumfrey.liteloader.launch.LiteLoaderTweaker'
clientJvmArgs += '-Dmcpenv=true' clientJvmArgs += '-Dmcpenv=true'
} }
project('common') {
apply plugin: 'net.minecraftforge.gradle.tweaker-client'
minecraft {
version = rootProject.minecraft.version
mappings = rootProject.minecraft.mappings
runDir = rootProject.minecraft.runDir
tweakClass = rootProject.minecraft.tweakClass
}
}
project('forge') { project('forge') {
apply plugin: 'net.minecraftforge.gradle.forge' apply plugin: 'net.minecraftforge.gradle.forge'
minecraft { minecraft {
@ -34,7 +25,7 @@ project('forge') {
replace '@VERSION@',project.version replace '@VERSION@',project.version
} }
dependencies { dependencies {
provided project(':common') provided rootProject
} }
} }
@ -57,26 +48,26 @@ repositories.flatDir {
dir 'liteloader' dir 'liteloader'
} }
dependencies { dependencies {
compile project('common')
deobfProvided 'com.mumfrey:liteloader:1.8-SNAPSHOT:srgnames' deobfProvided 'com.mumfrey:liteloader:1.8-SNAPSHOT:srgnames'
provided voxellib provided voxellib
} }
jar { jar {
manifest.attributes.remove 'TweakClass' manifest.attributes.remove 'TweakClass'
extension 'litemod'
from project('common').sourceSets.main.output
from project('forge').sourceSets.main.output
} }
task standaloneJar(type: Jar, dependsOn: [{voxellib.build}, reobfJar]) { task standaloneJar(type: Jar, dependsOn: [{voxellib.reobfObfJar}, {project('forge').compileJava}]) {
extension 'litemod' extension 'litemod'
from zipTree(jar.archivePath) from sourceSets.main.output
from {project('forge').sourceSets.main.output}
// voxellib // voxellib
from {voxellib.jar.archivePath} from {voxellib.obfJar.archivePath}
classifier 'standalone' classifier 'standalone'
} }
artifacts { artifacts {
archives standaloneJar archives standaloneJar
} }
reobf{
jar.task.enabled = false
standaloneJar{}
}

View file

@ -1,3 +1,3 @@
rootProject.name = 'MineLittlePony' rootProject.name = 'MineLittlePony'
include 'voxellib', 'common', 'forge' include 'voxellib', 'forge'

View file

@ -15,4 +15,14 @@ repositories.flatDir {
dependencies { dependencies {
deobfCompile 'com.mumfrey:liteloader:1.8-SNAPSHOT:srgnames' deobfCompile 'com.mumfrey:liteloader:1.8-SNAPSHOT:srgnames'
} }
jar.manifest.attributes.remove 'TweakClass' jar {
manifest.attributes.remove 'TweakClass'
classifier 'dev'
}
task obfJar(type:Jar) {
from sourceSets.main.output
}
reobf {
jar.task.enabled = false
obfJar {}
}