Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-06-12 12:33:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

6
worldedit-core/doctools/build.gradle.kts
View File

@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
kotlin("jvm") version "1.4.0"
kotlin("jvm") version "1.4.21"
application
}
@ -11,7 +11,7 @@ tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
}
application.mainClassName = "com.sk89q.worldedit.internal.util.DocumentationPrinter"
application.mainClass.set("com.sk89q.worldedit.internal.util.DocumentationPrinter")
tasks.named<JavaExec>("run") {
workingDir = rootProject.projectDir
}
@ -21,5 +21,5 @@ dependencies {
"implementation"(project(":worldedit-core"))
"implementation"(kotlin("stdlib-jdk8"))
"implementation"(kotlin("reflect"))
"implementation"("com.google.guava:guava:21.0")
"implementation"("com.google.guava:guava")
}

30
worldedit-core/doctools/src/main/kotlin/com/sk89q/worldedit/internal/util/DocumentationPrinter.kt
View File

@ -149,7 +149,7 @@ class DocumentationPrinter private constructor() {
}
private fun writeHeader() {
cmdOutput.appendln("""
cmdOutput.appendLine("""
========
Commands
========
@ -166,7 +166,7 @@ Commands
You can access a command listing in-game via the ``//help`` command.
""".trim())
permsOutput.appendln("""
permsOutput.appendLine("""
===========
Permissions
===========
@ -184,11 +184,11 @@ See the :doc:`commands` page for an explanation of some of these commands.
:header: Command, Permission
:widths: 15, 25
""".trim())
permsOutput.appendln()
permsOutput.appendLine()
}
private fun writeFooter() {
permsOutput.appendln()
permsOutput.appendLine()
permsOutput.append("""
Other Permissions
==================
@ -254,10 +254,10 @@ Other Permissions
val name = prefix + command.name
val entries = commandTableEntries(command, parents)
cmdOutput.appendln(".. raw:: html")
cmdOutput.appendln()
cmdOutput.appendln(""" <span id="command-${linkSafe(name)}"></span>""")
cmdOutput.appendln()
cmdOutput.appendLine(".. raw:: html")
cmdOutput.appendLine()
cmdOutput.appendLine(""" <span id="command-${linkSafe(name)}"></span>""")
cmdOutput.appendLine()
cmdOutput.append(".. topic:: ``$name``")
if (!command.aliases.isEmpty()) {
command.aliases.joinTo(cmdOutput, ", ",
@ -265,19 +265,19 @@ Other Permissions
postfix = ")",
transform = { "``$prefix$it``" })
}
cmdOutput.appendln()
cmdOutput.appendln(" :class: command-topic").appendln()
cmdOutput.appendLine()
cmdOutput.appendLine(" :class: command-topic").appendLine()
CommandUtil.deprecationWarning(command).ifPresent { warning ->
cmdOutput.appendln("""
cmdOutput.appendLine("""
| .. WARNING::
| ${reduceToRst(warning).makeRstSafe("\n\n")}
""".trimMargin())
}
cmdOutput.appendln("""
cmdOutput.appendLine("""
| .. csv-table::
| :widths: 8, 15
""".trimMargin())
cmdOutput.appendln()
cmdOutput.appendLine()
for ((k, v) in entries) {
val rstSafe = v.makeRstSafe("\n")
cmdOutput.append(" ".repeat(2))
@ -285,9 +285,9 @@ Other Permissions
.append(",")
.append('"')
.append(rstSafe)
.append('"').appendln()
.append('"').appendLine()
}
cmdOutput.appendln()
cmdOutput.appendLine()
}
private fun String.makeRstSafe(lineJoiner: String) = trim()