Update so many dependencies, merge Forge/Fabric for final jar (#1651)

* Update so many dependencies, merge Forge/Fabric for final

* Clean up contrib docs for Gradle change

* Fix setting compat flags while using toolchain

* Fix deprecation in doc printer

* Restore proper forge JAR name

* Add dist classifier for mod jar

* Properly relocate new bStats

* Fix jar used from fabric

* Fix fabric bom

* Dup the shaded classes for consistency

* Sync Forge/Fabric log4j versions, de-dup

* Downgrade both log4j. This will work

* Update some plugins as well

* Drop the fabric force stuff

* Use duplicate strategy to directly merge jar
This commit is contained in:
Octavia Togami
2021-01-25 05:14:09 -05:00
committed by MattBDev
parent f3d4621589
commit 8b1f043dc5
15 changed files with 156 additions and 54 deletions

2
worldedit-mod/README.md Normal file
View File

@ -0,0 +1,2 @@
This folder is for the merged output of Fabric and Forge jars. This allows us to distribute
both variants of the mod in a single file to avoid end-user confusion.

View File

@ -0,0 +1,24 @@
import net.fabricmc.loom.task.RemapJarTask
plugins {
base
}
applyCommonConfiguration()
tasks.register<Jar>("jar") {
val remapFabric = project(":worldedit-fabric").tasks.named<RemapJarTask>("remapShadowJar")
dependsOn(
remapFabric,
project(":worldedit-forge").tasks.named("reobfShadowJar")
)
from(zipTree({remapFabric.get().archiveFile}))
from(zipTree({project(":worldedit-forge").tasks.getByName("shadowJar").outputs.files.singleFile}))
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
archiveClassifier.set("dist")
}
tasks.named("assemble") {
dependsOn("jar")
}