DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix shadowJar task using incorrect jar with loom

Browse Source
This commit is contained in:
Jonas Herzig
2020-04-02 01:59:32 +02:00
parent c0e27634f4
commit 8ce84e39e2
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
versions/common.gradle
View File

@@ -273,6 +273,7 @@ dependencies {
shadow "com.github.ReplayMod:ReplayStudio:ce5876d", shadeExclusions shadow "com.github.ReplayMod:ReplayStudio:ce5876d", shadeExclusions
project.evaluationDependsOn(":jGui:$jGuiVersion")
shadowReobf(project(":jGui:$jGuiVersion")){ shadowReobf(project(":jGui:$jGuiVersion")){
transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those
exclude group: 'org.projectlombok', module: 'lombok' // runtime only for @SneakyThrows which isn't used exclude group: 'org.projectlombok', module: 'lombok' // runtime only for @SneakyThrows which isn't used
@@ -310,6 +311,14 @@ if (mcVersion <= 10710) {
} }
} }
if (FABRIC) {
tasks.remapJar {
afterEvaluate { // FIXME why does loom overwrite this if we set it immediately?
archiveClassifier.set('obf')
}
}
}
task configureRelocation() { task configureRelocation() {
dependsOn tasks.jar dependsOn tasks.jar
dependsOn configurations.relocate dependsOn configurations.relocate
@@ -367,7 +376,7 @@ task configureRelocation() {
tasks.removeByName('shadowJar') // we want to base our shadowed jar on the reobfJar output, not the sourceSet output tasks.removeByName('shadowJar') // we want to base our shadowed jar on the reobfJar output, not the sourceSet output
task shadowJar(type: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) { task shadowJar(type: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
from({ zipTree(tasks.jar.archivePath) }) { from({ zipTree((FABRIC ? tasks.remapJar : tasks.jar).archiveFile.get()) }) {
filesMatching('mixins.jgui.json') { filesMatching('mixins.jgui.json') {
filter { it.replace('de.johni0702', 'com.replaymod.lib.de.johni0702') } filter { it.replace('de.johni0702', 'com.replaymod.lib.de.johni0702') }
} }
@@ -375,7 +384,7 @@ task shadowJar(type: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar)
filter { it.replace('de/johni0702', 'com/replaymod/lib/de/johni0702') } filter { it.replace('de/johni0702', 'com/replaymod/lib/de/johni0702') }
} }
} }
afterEvaluate { dependsOn FABRIC ? tasks.remapJar : (mcVersion >= 10800 ? tasks.reobfJar : tasks.reobf) } dependsOn { FABRIC ? tasks.remapJar : (mcVersion >= 10800 ? tasks.reobfJar : tasks.reobf) }
manifest.inheritFrom tasks.jar.manifest manifest.inheritFrom tasks.jar.manifest
from project.configurations.shade from project.configurations.shade