Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-22 17:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Upstream

Browse Source 
bd87665 Update paperweight + userdev bundle. (1930)
This commit is contained in:
NotMyFault 2021-11-11 22:22:44 +01:00
parent 6df16cfe96
commit 3ad2f8b5fa
No known key found for this signature in database
GPG Key ID: 158F5701A6AAD00C
5 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/build.gradle.kts
View File

@ -28,5 +28,5 @@ dependencies {
implementation(gradleApi()) implementation(gradleApi())
implementation("org.ajoberstar.grgit:grgit-gradle:4.1.0") implementation("org.ajoberstar.grgit:grgit-gradle:4.1.0")
implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.0") implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.0")
implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.1.11") implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.1.14")
} }

22
buildSrc/src/main/kotlin/AdapterConfig.kt
View File

@ -1,23 +1,7 @@
import io.papermc.paperweight.util.constants.REOBF_CONFIG import io.papermc.paperweight.userdev.attribute.Obfuscation
import org.gradle.api.Named
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.attributes.Attribute
import org.gradle.kotlin.dsl.apply import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.dependencies import org.gradle.kotlin.dsl.dependencies
import org.gradle.kotlin.dsl.get
import org.gradle.kotlin.dsl.named
// TODO https://github.com/PaperMC/paperweight/pull/87
interface Obfuscation : Named {
companion object {
val OBFUSCATION_ATTRIBUTE = Attribute.of(
"com.fastasyncworldedit.obfuscation",
Obfuscation::class.java
)
const val NONE = "none"
const val REOBFUSCATED = "reobfuscated"
}
}
// For specific version pinning, see // For specific version pinning, see
// https://papermc.io/repo/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/ // https://papermc.io/repo/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
@ -40,8 +24,4 @@ fun Project.applyPaperweightAdapterConfiguration(
tasks.named("assemble") { tasks.named("assemble") {
dependsOn("reobfJar") dependsOn("reobfJar")
} }
configurations[REOBF_CONFIG].attributes {
attribute(Obfuscation.OBFUSCATION_ATTRIBUTE, objects.named(Obfuscation.REOBFUSCATED))
}
} }

2
worldedit-bukkit/adapters/adapter-1_17_1/build.gradle.kts
View File

@ -3,7 +3,7 @@ plugins {
} }
applyPaperweightAdapterConfiguration( applyPaperweightAdapterConfiguration(
"1.17.1-R0.1-20211001.111503-102" "1.17.1-R0.1-20211109.085555-183"
) )
repositories { repositories {

2
worldedit-bukkit/adapters/adapter-1_17_1/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/PaperweightAdapter.java
View File

@ -605,7 +605,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
Path tempDir = Files.createTempDirectory("FastAsyncWorldEditWorldGen"); Path tempDir = Files.createTempDirectory("FastAsyncWorldEditWorldGen");
LevelStorageSource levelStorage = LevelStorageSource.createDefault(tempDir); LevelStorageSource levelStorage = LevelStorageSource.createDefault(tempDir);
ResourceKey<LevelStem> worldDimKey = getWorldDimKey(env); ResourceKey<LevelStem> worldDimKey = getWorldDimKey(env);
try (LevelStorageSource.LevelStorageAccess session = levelStorage.c("worldeditregentempworld", worldDimKey)) { try (LevelStorageSource.LevelStorageAccess session = levelStorage.createAccess("worldeditregentempworld", worldDimKey)) {
ServerLevel originalWorld = ((CraftWorld) bukkitWorld).getHandle(); ServerLevel originalWorld = ((CraftWorld) bukkitWorld).getHandle();
PrimaryLevelData levelProperties = (PrimaryLevelData) originalWorld.getServer() PrimaryLevelData levelProperties = (PrimaryLevelData) originalWorld.getServer()
.getWorldData().overworldData(); .getWorldData().overworldData();

3
worldedit-bukkit/build.gradle.kts
View File

@ -1,4 +1,5 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import io.papermc.paperweight.userdev.attribute.Obfuscation
plugins { plugins {
`java-library` `java-library`
@ -59,7 +60,7 @@ val adapters = configurations.create("adapters") {
isCanBeResolved = true isCanBeResolved = true
shouldResolveConsistentlyWith(configurations["runtimeClasspath"]) shouldResolveConsistentlyWith(configurations["runtimeClasspath"])
attributes { attributes {
attribute(Obfuscation.OBFUSCATION_ATTRIBUTE, objects.named(Obfuscation.REOBFUSCATED)) attribute(Obfuscation.OBFUSCATION_ATTRIBUTE, objects.named(Obfuscation.OBFUSCATED))
} }
} }