sorceress
/
MatterLink
mirror of https://github.com/AgathaSorceress/MatterLink.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add proper required-after forgelin and forge version, improves to the build.gradle

This commit is contained in:
NikkyAI 2018-02-15 16:51:30 +01:00
parent 160681489b
commit 445bf425c2
9 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
1.10.2/build.gradle
View File

@ -16,20 +16,19 @@ plugins {
apply plugin: 'net.minecraftforge.gradle.forge' 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' sourceCompatibility = targetCompatibility = '1.8'
dependencies { dependencies {
compile project(':core') compile project(':core')
compile group: "net.shadowfacts", name: "Forgelin", version: "1.6.0" compile group: "net.shadowfacts", name: "Forgelin", version: project.forgelin_version
} }
shadowJar { shadowJar {
classifier '' classifier ''
// configurations = [project.configurations.shadow]
relocate "org.apache.http", "matterlink.repack.org.apache.http" relocate "org.apache.http", "matterlink.repack.org.apache.http"
relocate "org.apache.commons.logging", "matterlink.repack.org.apache.commons.logging" relocate "org.apache.commons.logging", "matterlink.repack.org.apache.commons.logging"
@ -43,14 +42,17 @@ shadowJar {
exclude 'dummyThing' exclude 'dummyThing'
} }
minecraft { minecraft {
version = mc_version + "-" + forge_version version = project.mc_version + "-" + project.forge_version
runDir = "run" runDir = "run"
mappings = mcp_mappings mappings = project.mcp_mappings
replaceIn 'MatterLink.kt' 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 { processResources {

2
1.10.2/gradle.properties
View File

@ -1,3 +1,3 @@
mc_version = 1.10.2 mc_version = 1.10.2
mcp_mappings = stable_29 mcp_mappings = stable_29
forge_version = 12.18.3.2185 forge_version = 12.18.3.2185

3
1.10.2/src/main/kotlin/matterlink/MatterLink.kt
View File

@ -26,7 +26,8 @@ lateinit var logger: Logger
serverSideOnly = true, serverSideOnly = true,
useMetadata = true, useMetadata = true,
acceptableRemoteVersions = "*", 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() { object MatterLink : IMatterLink() {
init { init {

15
1.11.2/build.gradle
View File

@ -16,20 +16,19 @@ plugins {
apply plugin: 'net.minecraftforge.gradle.forge' 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' sourceCompatibility = targetCompatibility = '1.8'
dependencies { dependencies {
compile project(':core') compile project(':core')
compile group: "net.shadowfacts", name: "Forgelin", version: "1.6.0" compile group: "net.shadowfacts", name: "Forgelin", version: project.forgelin_version
} }
shadowJar { shadowJar {
classifier '' classifier ''
// configurations = [project.configurations.shadow]
relocate "org.apache.http", "matterlink.repack.org.apache.http" relocate "org.apache.http", "matterlink.repack.org.apache.http"
relocate "org.apache.commons.logging", "matterlink.repack.org.apache.commons.logging" relocate "org.apache.commons.logging", "matterlink.repack.org.apache.commons.logging"
@ -44,13 +43,15 @@ shadowJar {
} }
minecraft { minecraft {
version = mc_version + "-" + forge_version version = project.mc_version + "-" + project.forge_version
runDir = "run" runDir = "run"
mappings = mcp_mappings mappings = project.mcp_mappings
replaceIn 'MatterLink.kt' 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 { processResources {

2
1.11.2/gradle.properties
View File

@ -1,3 +1,3 @@
mc_version = 1.11.2 mc_version = 1.11.2
mcp_mappings = stable_32 mcp_mappings = stable_32
forge_version = 13.20.1.2386 forge_version = 13.20.1.2386

3
1.11.2/src/main/kotlin/matterlink/MatterLink.kt
View File

@ -26,7 +26,8 @@ lateinit var logger: Logger
serverSideOnly = true, serverSideOnly = true,
useMetadata = true, useMetadata = true,
acceptableRemoteVersions = "*", 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() { object MatterLink : IMatterLink() {
init { init {

15
1.12.2/build.gradle
View File

@ -16,20 +16,19 @@ plugins {
apply plugin: 'net.minecraftforge.gradle.forge' 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' sourceCompatibility = targetCompatibility = '1.8'
dependencies { dependencies {
compile project(':core') compile project(':core')
compile group: "net.shadowfacts", name: "Forgelin", version: "1.6.0" compile group: "net.shadowfacts", name: "Forgelin", version: project.forgelin_version
} }
shadowJar { shadowJar {
classifier '' classifier ''
// configurations = [project.configurations.shadow]
relocate "org.apache.http", "matterlink.repack.org.apache.http" relocate "org.apache.http", "matterlink.repack.org.apache.http"
relocate "org.apache.commons.logging", "matterlink.repack.org.apache.commons.logging" relocate "org.apache.commons.logging", "matterlink.repack.org.apache.commons.logging"
@ -44,13 +43,15 @@ shadowJar {
} }
minecraft { minecraft {
version = mc_version + "-" + forge_version version = project.mc_version + "-" + project.forge_version
runDir = "run" runDir = "run"
mappings = mcp_mappings mappings = project.mcp_mappings
replaceIn 'MatterLink.kt' 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 { processResources {

3
1.12.2/src/main/kotlin/matterlink/MatterLink.kt
View File

@ -24,7 +24,8 @@ lateinit var logger: Logger
serverSideOnly = true, serverSideOnly = true,
useMetadata = true, useMetadata = true,
acceptableRemoteVersions = "*", 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() { object MatterLink : IMatterLink() {
init { init {

4
gradle.properties
View File

@ -1 +1,3 @@
mod_version = 1.3 mod_name = MatterLink
mod_version = 1.3
forgelin_version = 1.6.0