diff options
author | makamys <makamys@outlook.com> | 2022-12-24 18:41:56 +0100 |
---|---|---|
committer | makamys <makamys@outlook.com> | 2022-12-24 18:41:56 +0100 |
commit | 4e95bc8ad7640ad881c222b95fec55cf03a0dfbc (patch) | |
tree | da223187eb65481ac62fb2801a9ad33c71f05673 /buildscript | |
parent | a7294e0628800cee4a56e2b90d3f27d8f4039a22 (diff) | |
download | Neodymium-4e95bc8ad7640ad881c222b95fec55cf03a0dfbc.tar.gz Neodymium-4e95bc8ad7640ad881c222b95fec55cf03a0dfbc.tar.bz2 Neodymium-4e95bc8ad7640ad881c222b95fec55cf03a0dfbc.zip |
Update BS
Diffstat (limited to 'buildscript')
-rw-r--r-- | buildscript/forge-1.7-mixin.gradle | 18 | ||||
-rw-r--r-- | buildscript/forge-1.7.gradle | 27 |
2 files changed, 24 insertions, 21 deletions
diff --git a/buildscript/forge-1.7-mixin.gradle b/buildscript/forge-1.7-mixin.gradle index fddc15b..9612084 100644 --- a/buildscript/forge-1.7-mixin.gradle +++ b/buildscript/forge-1.7-mixin.gradle @@ -7,9 +7,21 @@ repositories { } } +def embedMixin = !project.hasProperty("nomixin"); + +if(!embedMixin){ + project.version += "+nomixin" +} + dependencies { - embed('org.spongepowered:mixin:0.7.11-SNAPSHOT'){ - setTransitive false + if(embedMixin){ + embed('org.spongepowered:mixin:0.7.11-SNAPSHOT'){ + setTransitive false + } + } else { + compile('org.spongepowered:mixin:0.7.11-SNAPSHOT'){ + setTransitive false + } } } @@ -39,4 +51,4 @@ afterEvaluate { reobf { addExtraSrgFile outSrgFile -}
\ No newline at end of file +} diff --git a/buildscript/forge-1.7.gradle b/buildscript/forge-1.7.gradle index f094cbb..cd74fd8 100644 --- a/buildscript/forge-1.7.gradle +++ b/buildscript/forge-1.7.gradle @@ -55,8 +55,17 @@ if(project.enable_mixin.toBoolean()) { apply from: "buildscript/forge-1.7-mixin.gradle" } +project.ext.override_dependencies = false + apply from: "project.gradle" +if(!project.ext.override_dependencies) { + dependencies { + runtimeOnly "codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev" + runtimeOnly "codechicken:CodeChickenCore:1.7.10-1.0.7.47:dev" + } +} + jar { from(sourceSets.main.output); @@ -90,24 +99,6 @@ tasks.withType(JavaCompile) { options.encoding = "UTF-8" } -// This task creates a .jar file containing the source code of this mod. -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = "sources" - from sourceSets.main.allSource -} - -// This task creates a .jar file containing a deobfuscated version of this mod, for other developers to use in a development environment. -task devJar(type: Jar) { - classifier = "dev" - from sourceSets.main.output -} - -// Creates the listed artifacts on building the mod. -artifacts { - archives sourcesJar - archives devJar -} - // Add git commit hash to MANIFEST.MF def getCommitHash(){ |