From af136e87455d399fc7ab474fb29e165d83077276 Mon Sep 17 00:00:00 2001 From: lexikiq Date: Thu, 9 Dec 2021 18:05:50 -0500 Subject: [PATCH] JDK 17 (trying to fix compile) --- .github/workflows/pr-build.yml | 2 +- .github/workflows/push-build.yml | 2 +- build-data/parchment.at | 2 -- build-data/reobf-mappings-patch.tiny | 18 ++++++++++++++++++ build.gradle.kts | 15 ++++----------- 5 files changed, 24 insertions(+), 15 deletions(-) delete mode 100644 build-data/parchment.at create mode 100644 build-data/reobf-mappings-patch.tiny diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 2aa834b..b27ff8d 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: - java: [16] + java: [17] fail-fast: true steps: diff --git a/.github/workflows/push-build.yml b/.github/workflows/push-build.yml index dba9332..ec0210b 100644 --- a/.github/workflows/push-build.yml +++ b/.github/workflows/push-build.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: - java: [16] + java: [17] fail-fast: true steps: diff --git a/build-data/parchment.at b/build-data/parchment.at deleted file mode 100644 index a5ca7a7..0000000 --- a/build-data/parchment.at +++ /dev/null @@ -1,2 +0,0 @@ -# Add UnsafeValues#canPlaceItemOn -public net.minecraft.world.item.BlockItem canPlace(Lnet/minecraft/world/item/context/BlockPlaceContext;Lnet/minecraft/world/level/block/state/BlockState;)Z diff --git a/build-data/reobf-mappings-patch.tiny b/build-data/reobf-mappings-patch.tiny new file mode 100644 index 0000000..375bde1 --- /dev/null +++ b/build-data/reobf-mappings-patch.tiny @@ -0,0 +1,18 @@ +# We would like for paperweight to generate 100% perfect reobf mappings (and deobf mappings for that matter). +# But unfortunately it's not quite there yet - and it may be some time before that happens. Generating perfect mappings +# from Spigot's mappings is extremely difficult due to Spigot's bad tooling and bad mappings. To add insult to injury +# we remap Spigot's _source code_ which is a lot more complex and error-prone than bytecode remapping. So with all that +# said, this file exists to help fill in the gap. +# +# We will continue to improve paperweight and will work on fixing these issues so they don't come up in the first place, +# but these mappings exist to prevent these issues from holding everything else in Paper up while we work through all +# of these issues. Due to the complex nature of mappings generation and the debugging difficulty involved it may take +# a significant amount of time for us to track down every possible issue, so this file will likely be around and in +# use - at least in some capacity - for a long time. +# +# If you are adding mappings patches which are correcting for issues in paperweight's reobf mappings generation, +# unrelated to any changes in your patches, we ask that you PR the mapping to Paper so more users can benefit rather +# than keep the fix for your own fork. If the mappings patch is there to correct reobf for changes made in your patches, +# then obviously it doesn't make any sense to PR them upstream. + +tiny 2 0 mojang+yarn spigot \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 9fb34bc..787392e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -26,7 +26,7 @@ allprojects { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(16)) + languageVersion.set(JavaLanguageVersion.of(17)) } } } @@ -34,7 +34,7 @@ allprojects { subprojects { tasks.withType().configureEach { options.encoding = Charsets.UTF_8.name() - options.release.set(16) + options.release.set(17) } tasks.withType { options.encoding = Charsets.UTF_8.name() @@ -45,12 +45,7 @@ subprojects { repositories { mavenCentral() - maven("https://oss.sonatype.org/content/groups/public/") maven("https://papermc.io/repo/repository/maven-public/") - maven("https://ci.emc.gs/nexus/content/groups/aikar/") - maven("https://repo.aikar.co/content/groups/aikar") - maven("https://repo.md-5.net/content/repositories/releases/") - maven("https://hub.spigotmc.org/nexus/content/groups/public/") } } @@ -80,12 +75,10 @@ tasks.generateDevelopmentBundle { mojangApiCoordinates.set("io.papermc.paper:paper-mojangapi") libraryRepositories.set( listOf( + "https://repo.maven.apache.org/maven2/", "https://libraries.minecraft.net/", - "https://maven.quiltmc.org/repository/release/", - "https://repo.aikar.co/content/groups/aikar", - "https://ci.emc.gs/nexus/content/groups/aikar/", "https://papermc.io/repo/repository/maven-public/", - "https://repo.velocitypowered.com/snapshots/", + "https://maven.quiltmc.org/repository/release/", "https://sonatype.projecteden.gg/repository/maven-public/" ) )