mirror of
https://github.com/plexusorg/Plex-FAWE.git
synced 2024-11-02 10:57:11 +00:00
aa3ae63682
* start v6 * Update classes to v6 method signatures * change rootVersion to signify p2v6 compat * Use 16 as toolchain version but target 11 for build output * add minimessage as api * Require v6 and don't attempt to "setup" hook from FAWE * Address comments * *address /all/ comments * FAWE classes should only act as a delegate * Uppercase logger * Settings for v6-hook have moved to P2-v6, remove unneeded if statements * Rename classes to Delegate * add whenDone task to setCuboids * Remove bad spaces * Fix plot swap * Initial work on 1.17 support * Remove data versions from the Bukkit adapters (#1507) * Remove data versions from the Bukkit adapters * Don't allow saving schematics without an adapter in place on Bukkit. * Removed confusing line (cherry picked from commit 2056218b4a8644836b1d127105dfa289e9cdbc1c) * More progress * Fix chunk sending * Repackage from com.boydti to com.fastasyncworldedit.<module> (#1119) * Preliminary work on repackaging * Rename build artifacts matching our pattern * Finish up repackaging * Fix a few field accesses and old imports * Dirty fix for chunks container ChunkSections outside of 0-15 * Correctly read from NibbleArrays for lighting * Fix getSections and BlockMaterial for 1.17 * Fix writing blocks to the world. - The issue isn't the presence of a "-1" chunk, it's the constructor for ChunkSection requiring the layer (0 to 15) rather than the y chord * Fix more field accesses * More work towards 1.17 * Update Upstream a57f66f Fix watchdog, add negative y support. (1782) * Add azalea tree to `/tool tree` * Don't define toolchain twice * Repackage GriefDefender * Relocate under new namespace * Bye bye ecma left overs * Add 1.17 to issue templates and instructions * Move to adventure-nbt (#918) * Initial work for adventure-nbt * Some more FAWE specific stuff * Fix erroneous deprecation check * Workflow change * Continued merging all adventure NBT related changes * Continued merging all adventure NBT related changes * Made a constructor public again This needs to be public for BlockTransformExtent.java * Finished converting all NBT data to adventure. * Make this compile * Fix conflicts Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com> * Update adapters to 1.17 * Change build prefix to 1.17 * Move more nms classes to adapters * Move left over nms classes * Move Spigot 1.17 class * Remove unneeded adapter loader code The loader will find the appropriate class now itself * Update adapters * Update adapters * Lazy fix tests * Update adapters * Update Upstream 43da91a Remove method reflection for getMinHeight in BukkitWorld. (1796) * Relocate adventure-nbt under proper namespace * Add LazyCompoundTag as a non-version-specific class to be used by adapters * Better integration between old NBT and Adventure NBT - begin fixing the issues seen recently * Correctly NBT conversion method * LazyCompoundTags should actually be overriding and correctly returning a CompoundBinaryTag. * Update worldedit-adapters Fixes #1141 * Remove unnecessary massive lag machine * Refactor apply to applyBlock in subclasses * applyBlock should be overriden by all subclasses. Default apply to applyBlock * Closes #1130 Closes #1132 * Squashed commit of the following: commit a9bfa1a07c77083c844a0c3ba62f4bd94bed107c Author: NotMyFault <mc.cache@web.de> Date: Sun Jun 27 21:53:21 2021 +0200 [ci skip] Update gradle wrapper validation commit aa7471f95317d28a16f62e4b200de8d0fea2fa95 Author: Matthew Miller <mnmiller1@me.com> Date: Sat Oct 10 15:49:13 2020 +1000 Add ^x,y,z relative offset support to the offset parser (#1545) * Add ^x,y,z relative offset support to the offset parser * Wrap in a try-catch (cherry picked from commit 28bdf7ff9254bbc85bb4f5f792b303943a3930a8) * Add `fawe.error.schematic.not.found` translation key * Update Upstream 728a152 Skip notify if chunk section doesn't exist (1794) * Fixed #1157 * Add a null check to prevent NPE in nbt code * Update adapters * Update Upstream fbb047a Optimize legacy schematic loading (1808) * Hurr durr I don't want to update Java * Update Upstream 0790e6e Fix CLI Mess (1811) * Fixes #1160 * Expose minimessage transitively thru PlotSquared Touches #32 * [ci skip] Remove unneeded maven repository * Steal tab completion from PlotSquared for P2 related commands * Don't error on startup when building locally Co-Authored-By: goldfishapp <8278196+goldfishapp@users.noreply.github.com> * [ci skip] Update gh actions to Java 16 * Update textures to grab 1.17 jar Co-authored-by: NotMyFault <mc.cache@web.de> Co-authored-by: SirYwell <hannesgreule@outlook.de> Co-authored-by: Matthew Miller <mnmiller1@me.com> Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com> Co-authored-by: goldfishapp <8278196+goldfishapp@users.noreply.github.com>
193 lines
7.0 KiB
Kotlin
193 lines
7.0 KiB
Kotlin
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
|
import org.gradle.api.Plugin
|
|
import org.gradle.api.Project
|
|
import org.gradle.api.artifacts.ExternalModuleDependency
|
|
import org.gradle.api.artifacts.ModuleDependency
|
|
import org.gradle.api.attributes.Bundling
|
|
import org.gradle.api.attributes.Category
|
|
import org.gradle.api.attributes.DocsType
|
|
import org.gradle.api.attributes.LibraryElements
|
|
import org.gradle.api.attributes.Usage
|
|
import org.gradle.api.attributes.java.TargetJvmVersion
|
|
import org.gradle.api.component.AdhocComponentWithVariants
|
|
import org.gradle.api.component.SoftwareComponentFactory
|
|
import org.gradle.api.publish.PublishingExtension
|
|
import org.gradle.api.publish.maven.MavenPublication
|
|
import org.gradle.api.tasks.bundling.Jar
|
|
import org.gradle.kotlin.dsl.apply
|
|
import org.gradle.kotlin.dsl.configure
|
|
import org.gradle.kotlin.dsl.get
|
|
import org.gradle.kotlin.dsl.getPlugin
|
|
import org.gradle.kotlin.dsl.invoke
|
|
import org.gradle.kotlin.dsl.named
|
|
import org.gradle.kotlin.dsl.register
|
|
import javax.inject.Inject
|
|
|
|
fun Project.applyLibrariesConfiguration() {
|
|
applyCommonConfiguration()
|
|
apply(plugin = "java-base")
|
|
apply(plugin = "maven-publish")
|
|
apply(plugin = "com.github.johnrengelman.shadow")
|
|
|
|
configurations {
|
|
create("shade")
|
|
}
|
|
|
|
group = "${rootProject.group}.worldedit-libs"
|
|
|
|
val relocations = mapOf(
|
|
"net.kyori.text" to "com.sk89q.worldedit.util.formatting.text",
|
|
"net.kyori.minecraft" to "com.sk89q.worldedit.util.kyori",
|
|
"net.kyori.adventure.nbt" to "com.sk89q.worldedit.util.nbt"
|
|
|
|
)
|
|
|
|
tasks.register<ShadowJar>("jar") {
|
|
configurations = listOf(project.configurations["shade"])
|
|
archiveClassifier.set("")
|
|
|
|
dependencies {
|
|
exclude(dependency("com.google.guava:guava"))
|
|
exclude(dependency("com.google.code.gson:gson"))
|
|
exclude(dependency("org.checkerframework:checker-qual"))
|
|
exclude(dependency("org.apache.logging.log4j:log4j-api"))
|
|
}
|
|
|
|
relocations.forEach { (from, to) ->
|
|
relocate(from, to)
|
|
}
|
|
}
|
|
val altConfigFiles = { artifactType: String ->
|
|
val deps = configurations["shade"].incoming.dependencies
|
|
.filterIsInstance<ModuleDependency>()
|
|
.map { it.copy() }
|
|
.map { dependency ->
|
|
dependency.artifact {
|
|
name = dependency.name
|
|
type = artifactType
|
|
extension = "jar"
|
|
classifier = artifactType
|
|
}
|
|
dependency
|
|
}
|
|
|
|
files(configurations.detachedConfiguration(*deps.toTypedArray())
|
|
.resolvedConfiguration.lenientConfiguration.artifacts
|
|
.filter { it.classifier == artifactType }
|
|
.map { zipTree(it.file) })
|
|
}
|
|
tasks.register<Jar>("sourcesJar") {
|
|
from({
|
|
altConfigFiles("sources")
|
|
})
|
|
relocations.forEach { (from, to) ->
|
|
val filePattern = Regex("(.*)${from.replace('.', '/')}((?:/|$).*)")
|
|
val textPattern = Regex.fromLiteral(from)
|
|
eachFile {
|
|
filter {
|
|
it.replaceFirst(textPattern, to)
|
|
}
|
|
path = path.replaceFirst(filePattern, "$1${to.replace('.', '/')}$2")
|
|
}
|
|
}
|
|
archiveClassifier.set("sources")
|
|
}
|
|
|
|
tasks.named("assemble").configure {
|
|
dependsOn("jar", "sourcesJar")
|
|
}
|
|
|
|
project.apply<LibsConfigPluginHack>()
|
|
|
|
val libsComponent = project.components["libs"] as AdhocComponentWithVariants
|
|
|
|
val apiElements = project.configurations.register("apiElements") {
|
|
isVisible = false
|
|
description = "API elements for libs"
|
|
isCanBeResolved = false
|
|
isCanBeConsumed = true
|
|
attributes {
|
|
attribute(Usage.USAGE_ATTRIBUTE, project.objects.named(Usage.JAVA_API))
|
|
attribute(Category.CATEGORY_ATTRIBUTE, project.objects.named(Category.LIBRARY))
|
|
attribute(Bundling.BUNDLING_ATTRIBUTE, project.objects.named(Bundling.SHADOWED))
|
|
attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, project.objects.named(LibraryElements.JAR))
|
|
attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 11)
|
|
}
|
|
outgoing.artifact(tasks.named("jar"))
|
|
}
|
|
|
|
val runtimeElements = project.configurations.register("runtimeElements") {
|
|
isVisible = false
|
|
description = "Runtime elements for libs"
|
|
isCanBeResolved = false
|
|
isCanBeConsumed = true
|
|
attributes {
|
|
attribute(Usage.USAGE_ATTRIBUTE, project.objects.named(Usage.JAVA_RUNTIME))
|
|
attribute(Category.CATEGORY_ATTRIBUTE, project.objects.named(Category.LIBRARY))
|
|
attribute(Bundling.BUNDLING_ATTRIBUTE, project.objects.named(Bundling.SHADOWED))
|
|
attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, project.objects.named(LibraryElements.JAR))
|
|
attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 11)
|
|
}
|
|
outgoing.artifact(tasks.named("jar"))
|
|
}
|
|
|
|
val sourcesElements = project.configurations.register("sourcesElements") {
|
|
isVisible = false
|
|
description = "Source elements for libs"
|
|
isCanBeResolved = false
|
|
isCanBeConsumed = true
|
|
attributes {
|
|
attribute(Usage.USAGE_ATTRIBUTE, project.objects.named(Usage.JAVA_RUNTIME))
|
|
attribute(Category.CATEGORY_ATTRIBUTE, project.objects.named(Category.DOCUMENTATION))
|
|
attribute(Bundling.BUNDLING_ATTRIBUTE, project.objects.named(Bundling.SHADOWED))
|
|
attribute(DocsType.DOCS_TYPE_ATTRIBUTE, project.objects.named(DocsType.SOURCES))
|
|
}
|
|
outgoing.artifact(tasks.named("sourcesJar"))
|
|
}
|
|
|
|
libsComponent.addVariantsFromConfiguration(apiElements.get()) {
|
|
mapToMavenScope("compile")
|
|
}
|
|
|
|
libsComponent.addVariantsFromConfiguration(runtimeElements.get()) {
|
|
mapToMavenScope("runtime")
|
|
}
|
|
|
|
libsComponent.addVariantsFromConfiguration(sourcesElements.get()) {
|
|
mapToMavenScope("runtime")
|
|
}
|
|
|
|
configure<PublishingExtension> {
|
|
publications {
|
|
register<MavenPublication>("maven") {
|
|
from(libsComponent)
|
|
}
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
// A horrible hack because `softwareComponentFactory` has to be gotten via plugin
|
|
// gradle why
|
|
internal open class LibsConfigPluginHack @Inject constructor(
|
|
private val softwareComponentFactory: SoftwareComponentFactory
|
|
) : Plugin<Project> {
|
|
override fun apply(project: Project) {
|
|
val libsComponents = softwareComponentFactory.adhoc("libs")
|
|
project.components.add(libsComponents)
|
|
}
|
|
}
|
|
|
|
fun Project.constrainDependenciesToLibsCore() {
|
|
evaluationDependsOn(":worldedit-libs:core")
|
|
val coreDeps = project(":worldedit-libs:core").configurations["shade"].dependencies
|
|
.filterIsInstance<ExternalModuleDependency>()
|
|
dependencies.constraints {
|
|
for (coreDep in coreDeps) {
|
|
add("shade", "${coreDep.group}:${coreDep.name}:${coreDep.version}") {
|
|
because("libs should align with libs:core")
|
|
}
|
|
}
|
|
}
|
|
}
|