From 445bf425c2858b657bd91f242396a9d556174b9e Mon Sep 17 00:00:00 2001 From: NikkyAI Date: Thu, 15 Feb 2018 16:51:30 +0100 Subject: [PATCH] add proper required-after forgelin and forge version, improves to the build.gradle --- 1.10.2/build.gradle | 16 +++++++++------- 1.10.2/gradle.properties | 2 +- 1.10.2/src/main/kotlin/matterlink/MatterLink.kt | 3 ++- 1.11.2/build.gradle | 15 ++++++++------- 1.11.2/gradle.properties | 2 +- 1.11.2/src/main/kotlin/matterlink/MatterLink.kt | 3 ++- 1.12.2/build.gradle | 15 ++++++++------- 1.12.2/src/main/kotlin/matterlink/MatterLink.kt | 3 ++- gradle.properties | 4 +++- 9 files changed, 36 insertions(+), 27 deletions(-) diff --git a/1.10.2/build.gradle b/1.10.2/build.gradle index b1fbb43..8704693 100644 --- a/1.10.2/build.gradle +++ b/1.10.2/build.gradle @@ -16,20 +16,19 @@ plugins { apply plugin: 'net.minecraftforge.gradle.forge' -version = mc_version + "-" + mod_version +version = project.mc_version + "-" + project.mod_version -archivesBaseName = "MatterLink" +archivesBaseName = project.mod_name sourceCompatibility = targetCompatibility = '1.8' dependencies { compile project(':core') - compile group: "net.shadowfacts", name: "Forgelin", version: "1.6.0" + compile group: "net.shadowfacts", name: "Forgelin", version: project.forgelin_version } shadowJar { classifier '' - // configurations = [project.configurations.shadow] relocate "org.apache.http", "matterlink.repack.org.apache.http" relocate "org.apache.commons.logging", "matterlink.repack.org.apache.commons.logging" @@ -43,14 +42,17 @@ shadowJar { exclude 'dummyThing' } + minecraft { - version = mc_version + "-" + forge_version + version = project.mc_version + "-" + project.forge_version runDir = "run" - mappings = mcp_mappings + mappings = project.mcp_mappings replaceIn 'MatterLink.kt' - replace '@VERSION@', mod_version + replace '@VERSION@', project.mod_version + replace '@FORGELIN-VERSION@', project.forgelin_version + replace '@FORGE-VERSION@', project.forge_version } processResources { diff --git a/1.10.2/gradle.properties b/1.10.2/gradle.properties index d6fa378..1283b75 100644 --- a/1.10.2/gradle.properties +++ b/1.10.2/gradle.properties @@ -1,3 +1,3 @@ mc_version = 1.10.2 mcp_mappings = stable_29 -forge_version = 12.18.3.2185 \ No newline at end of file +forge_version = 12.18.3.2185 diff --git a/1.10.2/src/main/kotlin/matterlink/MatterLink.kt b/1.10.2/src/main/kotlin/matterlink/MatterLink.kt index 76f9b54..61ead07 100644 --- a/1.10.2/src/main/kotlin/matterlink/MatterLink.kt +++ b/1.10.2/src/main/kotlin/matterlink/MatterLink.kt @@ -26,7 +26,8 @@ lateinit var logger: Logger serverSideOnly = true, useMetadata = true, acceptableRemoteVersions = "*", - modLanguageAdapter = "net.shadowfacts.forgelin.KotlinAdapter" + modLanguageAdapter = "net.shadowfacts.forgelin.KotlinAdapter", + dependencies = "required-after:forgelin@[@FORGELIN-VERSION@,);required-after:forge@[@FORGE-VERSION@,);" ) object MatterLink : IMatterLink() { init { diff --git a/1.11.2/build.gradle b/1.11.2/build.gradle index b1fbb43..15dabbd 100644 --- a/1.11.2/build.gradle +++ b/1.11.2/build.gradle @@ -16,20 +16,19 @@ plugins { apply plugin: 'net.minecraftforge.gradle.forge' -version = mc_version + "-" + mod_version +version = project.mc_version + "-" + project.mod_version -archivesBaseName = "MatterLink" +archivesBaseName = project.mod_name sourceCompatibility = targetCompatibility = '1.8' dependencies { compile project(':core') - compile group: "net.shadowfacts", name: "Forgelin", version: "1.6.0" + compile group: "net.shadowfacts", name: "Forgelin", version: project.forgelin_version } shadowJar { classifier '' - // configurations = [project.configurations.shadow] relocate "org.apache.http", "matterlink.repack.org.apache.http" relocate "org.apache.commons.logging", "matterlink.repack.org.apache.commons.logging" @@ -44,13 +43,15 @@ shadowJar { } minecraft { - version = mc_version + "-" + forge_version + version = project.mc_version + "-" + project.forge_version runDir = "run" - mappings = mcp_mappings + mappings = project.mcp_mappings replaceIn 'MatterLink.kt' - replace '@VERSION@', mod_version + replace '@VERSION@', project.mod_version + replace '@FORGELIN-VERSION@', project.forgelin_version + replace '@FORGE-VERSION@', project.forge_version } processResources { diff --git a/1.11.2/gradle.properties b/1.11.2/gradle.properties index 4581a9e..7ebea1b 100644 --- a/1.11.2/gradle.properties +++ b/1.11.2/gradle.properties @@ -1,3 +1,3 @@ mc_version = 1.11.2 mcp_mappings = stable_32 -forge_version = 13.20.1.2386 \ No newline at end of file +forge_version = 13.20.1.2386 diff --git a/1.11.2/src/main/kotlin/matterlink/MatterLink.kt b/1.11.2/src/main/kotlin/matterlink/MatterLink.kt index 897ab84..cf3d9fb 100644 --- a/1.11.2/src/main/kotlin/matterlink/MatterLink.kt +++ b/1.11.2/src/main/kotlin/matterlink/MatterLink.kt @@ -26,7 +26,8 @@ lateinit var logger: Logger serverSideOnly = true, useMetadata = true, acceptableRemoteVersions = "*", - modLanguageAdapter = "net.shadowfacts.forgelin.KotlinAdapter" + modLanguageAdapter = "net.shadowfacts.forgelin.KotlinAdapter", + dependencies = "required-after:forgelin@[@FORGELIN-VERSION@,);required-after:forge@[@FORGE-VERSION@,);" ) object MatterLink : IMatterLink() { init { diff --git a/1.12.2/build.gradle b/1.12.2/build.gradle index 663d187..a53bba4 100644 --- a/1.12.2/build.gradle +++ b/1.12.2/build.gradle @@ -16,20 +16,19 @@ plugins { apply plugin: 'net.minecraftforge.gradle.forge' -version = mc_version + "-" + mod_version +version = project.mc_version + "-" + project.mod_version -archivesBaseName = "MatterLink" +archivesBaseName = project.mod_name sourceCompatibility = targetCompatibility = '1.8' dependencies { compile project(':core') - compile group: "net.shadowfacts", name: "Forgelin", version: "1.6.0" + compile group: "net.shadowfacts", name: "Forgelin", version: project.forgelin_version } shadowJar { classifier '' - // configurations = [project.configurations.shadow] relocate "org.apache.http", "matterlink.repack.org.apache.http" relocate "org.apache.commons.logging", "matterlink.repack.org.apache.commons.logging" @@ -44,13 +43,15 @@ shadowJar { } minecraft { - version = mc_version + "-" + forge_version + version = project.mc_version + "-" + project.forge_version runDir = "run" - mappings = mcp_mappings + mappings = project.mcp_mappings replaceIn 'MatterLink.kt' - replace '@VERSION@', mod_version + replace '@VERSION@', project.mod_version + replace '@FORGELIN-VERSION@', project.forgelin_version + replace '@FORGE-VERSION@', project.forge_version } processResources { diff --git a/1.12.2/src/main/kotlin/matterlink/MatterLink.kt b/1.12.2/src/main/kotlin/matterlink/MatterLink.kt index 84706d6..cb18b50 100644 --- a/1.12.2/src/main/kotlin/matterlink/MatterLink.kt +++ b/1.12.2/src/main/kotlin/matterlink/MatterLink.kt @@ -24,7 +24,8 @@ lateinit var logger: Logger serverSideOnly = true, useMetadata = true, acceptableRemoteVersions = "*", - modLanguageAdapter = "net.shadowfacts.forgelin.KotlinAdapter" + modLanguageAdapter = "net.shadowfacts.forgelin.KotlinAdapter", + dependencies = "required-after:forgelin@[@FORGELIN-VERSION@,);required-after:forge@[@FORGE-VERSION@,);" ) object MatterLink : IMatterLink() { init { diff --git a/gradle.properties b/gradle.properties index 5867878..9d6a851 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,3 @@ -mod_version = 1.3 \ No newline at end of file +mod_name = MatterLink +mod_version = 1.3 +forgelin_version = 1.6.0 \ No newline at end of file