add proper required-after forgelin and forge version, improves to the build.gradle
This commit is contained in:
parent
160681489b
commit
445bf425c2
|
@ -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 {
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
mc_version = 1.10.2
|
||||
mcp_mappings = stable_29
|
||||
forge_version = 12.18.3.2185
|
||||
forge_version = 12.18.3.2185
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
mc_version = 1.11.2
|
||||
mcp_mappings = stable_32
|
||||
forge_version = 13.20.1.2386
|
||||
forge_version = 13.20.1.2386
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -1 +1,3 @@
|
|||
mod_version = 1.3
|
||||
mod_name = MatterLink
|
||||
mod_version = 1.3
|
||||
forgelin_version = 1.6.0
|
Loading…
Reference in New Issue