Update upstream + bump deps

2021-06-20 16:03:07 -04:00
parent 6018ed1900
commit d19086dd13
7 changed files with 30 additions and 31 deletions
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -37,9 +37,9 @@ jobs:
        git config --global user.email "no-reply@github.com"
        git config --global user.name "GitHub Actions"
        ./gradlew applyPatches
-        ./gradlew reobfJar
+        ./gradlew paperclipJar

    - uses: actions/upload-artifact@v2
      with:
        name: Parchment-PR${{ github.event.pull_request.number }}-JDK${{ matrix.java }}
-        path: parchment-paperclip.jar
+        path: build/libs/Parchment-*.jar
--- a/.github/workflows/push-build.yml
+++ b/.github/workflows/push-build.yml
@@ -37,9 +37,9 @@ jobs:
          git config --global user.email "no-reply@github.com"
          git config --global user.name "GitHub Actions"
          ./gradlew applyPatches
-          ./gradlew reobfJar
+          ./gradlew paperclipJar
        
      - uses: actions/upload-artifact@v2
        with:
          name: Parchment-JDK${{ matrix.java }}
-          path: parchment-paperclip.jar
+          path: build/libs/Parchment-*.jar
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
    java
    id("com.github.johnrengelman.shadow") version "7.0.0" apply false
-    id("io.papermc.paperweight.patcher") version "1.0.4"
+    id("io.papermc.paperweight.patcher") version "1.1.5"
 }

 repositories {
@@ -20,7 +20,7 @@ repositories {

 dependencies {
    remapper("org.quiltmc:tiny-remapper:0.4.1")
-    paperclip("io.papermc:paperclip:2.0.0-SNAPSHOT@jar")
+    paperclip("io.papermc:paperclip:2.0.1@jar")
 }

 subprojects {
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ version = 1.17-R0.1-SNAPSHOT

 mcVersion = 1.17
 packageVersion = 1_17_R1
-paperRef = 98994a0aa1e72c851b9ea6fb26fcd15ca02a0f6a
+paperRef = 17f71ac87b7967ba203d34f039563a31010f26af
--- a/patches/api/0001-Build-changes.patch
+++ b/patches/api/0001-Build-changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes


 diff --git a/build.gradle.kts b/build.gradle.kts
-index 6d04816e22f44a33c001d2b7e080402fba6af86c..f24243834c48f31613a36c3d1f8e779bfe93041e 100644
+index e142072f31a41b25ac637970f79e71ab70c2f28c..2d3160cc96fa3783ec9863ff3f7325a90291ce91 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
@@ -1,4 +1,5 @@
@@ -22,9 +22,9 @@ index 6d04816e22f44a33c001d2b7e080402fba6af86c..f24243834c48f31613a36c3d1f8e779b
 
     compileOnly("org.apache.maven:maven-resolver-provider:3.8.1")
     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
-@@ -45,6 +47,26 @@ dependencies {
- configure<PublishingExtension> {
+@@ -46,6 +48,26 @@ configure<PublishingExtension> {
     publications.create<MavenPublication>("maven") {
+         artifactId = project.name.toLowerCase(Locale.ENGLISH)
         from(components["java"])
 +// Parchment start
 +        groupId = project.group as String?
--- a/patches/server/0001-Build-changes.patch
+++ b/patches/server/0001-Build-changes.patch
@@ -5,19 +5,18 @@ Subject: [PATCH] Build changes


 diff --git a/build.gradle.kts b/build.gradle.kts
-index f111042223f0d7974785c37245bb60b75388163e..63d62bdc61c50a06d594a6635caeb61ea1445370 100644
+index 04938bb10c35d2e424043adb7ed8fec2e42bb816..753dd00f2ef45be97240ce92ce63aaef8f67cb86 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -5,6 +5,8 @@ import io.papermc.paperweight.util.path
- import shadow.org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor.PLUGIN_CACHE_FILE
+@@ -6,6 +6,7 @@ import shadow.org.apache.logging.log4j.core.config.plugins.processor.PluginProce
 import java.text.SimpleDateFormat
 import java.util.Date
-+import java.util.Locale // Parchment
+ import java.util.Locale
 +import java.net.URI // Parchment
 
 plugins {
     java
-@@ -19,8 +21,8 @@ repositories {
+@@ -18,8 +19,8 @@ repositories {
 }
 
 dependencies {
@@ -28,10 +27,10 @@ index f111042223f0d7974785c37245bb60b75388163e..63d62bdc61c50a06d594a6635caeb61e
     // Paper start
     implementation("org.jline:jline-terminal-jansi:3.12.1")
     implementation("net.minecrell:terminalconsoleappender:1.2.0")
-@@ -87,6 +89,26 @@ configure<PublishingExtension> {
-         artifact(tasks.reobfJar) {
-             classifier = "reobf"
+@@ -86,6 +87,26 @@ publishing {
+             classifier = null
         }
+         artifact(tasks.shadowJar)
 +// Parchment start
 +        groupId = project.group as String?
 +        artifactId = "parchment"
@@ -55,8 +54,8 @@ index f111042223f0d7974785c37245bb60b75388163e..63d62bdc61c50a06d594a6635caeb61e
     }
 }
 
-@@ -95,7 +117,7 @@ val generatePom = tasks.named<GenerateMavenPom>("generatePomFileForMavenPublicat
- tasks.shadowJar {
+@@ -96,7 +117,7 @@ tasks.shadowJar {
+ 
     // Needed for Paperclip's install to maven local feature
     from(generatePom) {
 -        into("META-INF/maven/io.papermc.paper/paper")
@@ -64,7 +63,7 @@ index f111042223f0d7974785c37245bb60b75388163e..63d62bdc61c50a06d594a6635caeb61e
         rename { "pom.xml" }
     }
 
-@@ -119,7 +141,7 @@ tasks.test {
+@@ -122,7 +143,7 @@ tasks.test {
 fun TaskContainer.registerRunTask(
     name: String, block: JavaExec.() -> Unit
 ): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -87,7 +86,7 @@ index 218f5bafeed8551b55b91c7fccaf6935c8b631ca..52126870f1fc15a9ddce4452673b236e
 
     /**
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c6747f49ae8ddc9fc1bad82ab480f85d0883da5d..648f062c5d0e5a73d12e1174ea35dfb5b2eb0228 100644
+index 3bf39c2d2aa3fc4fd0815dacea57e4899ec0da0e..f891a5c0e6547913e2b46987e37226731630974d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1649,7 +1649,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -100,7 +99,7 @@ index c6747f49ae8ddc9fc1bad82ab480f85d0883da5d..648f062c5d0e5a73d12e1174ea35dfb5
 
     public SystemReport fillSystemReport(SystemReport systemreport) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8a98bd1018afd934696fedbed24e271ab6b75f51..852ebc691af6a356182ecbc08c27165f2b1b2052 100644
+index 3948fd10d8bd0994d97dfd5f26fb0dc5f0b5ac8e..5a4eb1eac2bdcba7990f9eb39a8d2ee2852bca21 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper
@@ -113,7 +112,7 @@ index 8a98bd1018afd934696fedbed24e271ab6b75f51..852ebc691af6a356182ecbc08c27165f
     private final String bukkitVersion = Versioning.getBukkitVersion();
     private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index ba01312f7615d0507c1bd1cd175588197f8d122e..4b2a4c7a14923b2ea78c97ec1544b338bc8d42b6 100644
+index 32f82c60b680180b256edff127e5a6ded42fccf4..cf6ccc83b3c91722125f7f0cd84e18e6181679fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -269,7 +269,7 @@ public class Main {
--- a/patches/server/0002-Add-SoundEvent.patch
+++ b/patches/server/0002-Add-SoundEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add SoundEvent


 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f893d8ab74293feec6ef69c5a4ddec57b11ca751..d6dbd903316ec16088ce7022b173285cd2fe80cd 100644
+index b3312fa2fd218ffcfaa61d98584003c97fbda4ce..1938251c9214932837e0bf0937fb31465d7c0ed3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -55,8 +55,8 @@ import net.minecraft.network.protocol.game.ClientboundExplodePacket;
@@ -19,7 +19,7 @@ index f893d8ab74293feec6ef69c5a4ddec57b11ca751..d6dbd903316ec16088ce7022b173285c
 import net.minecraft.network.protocol.game.DebugPackets;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.MCUtil;
-@@ -1335,12 +1335,12 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -1308,12 +1308,12 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
 
     @Override
     public void playSound(@Nullable Player player, double x, double y, double z, SoundEvent sound, SoundSource category, float volume, float pitch) {
@@ -35,7 +35,7 @@ index f893d8ab74293feec6ef69c5a4ddec57b11ca751..d6dbd903316ec16088ce7022b173285c
 
     @Override
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 53f6a45a505725c81ab15bd2daa1c61b024f1d68..bbe27b5334578e547eefd8eaca3d2ce23d3ff854 100644
+index 935b22199ebdf84db591f8442e0506d8fcc92e02..ad7ed7b967855f6b1702760fe96f33cf776c773d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -67,7 +67,7 @@ import net.minecraft.network.protocol.game.ClientboundRespawnPacket;
@@ -47,7 +47,7 @@ index 53f6a45a505725c81ab15bd2daa1c61b024f1d68..bbe27b5334578e547eefd8eaca3d2ce2
 import net.minecraft.network.protocol.game.ClientboundUpdateMobEffectPacket;
 import net.minecraft.network.protocol.game.ServerboundClientInformationPacket;
 import net.minecraft.resources.ResourceKey;
-@@ -2134,7 +2134,7 @@ public class ServerPlayer extends Player {
+@@ -2136,7 +2136,7 @@ public class ServerPlayer extends Player {
 
     @Override
     public void playNotifySound(SoundEvent event, SoundSource category, float volume, float pitch) {
@@ -57,7 +57,7 @@ index 53f6a45a505725c81ab15bd2daa1c61b024f1d68..bbe27b5334578e547eefd8eaca3d2ce2
 
     @Override
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index bc3fe18dd32da2d381b9546aae675a475c073696..fae458c2ec53e8663536c183d2487a2a6041d24e 100644
+index a6ecbb7eb1df7923d58366327e0f00512a3a1677..43dc36e6da0b044279021ef48bed29a9d4f59bbe 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -58,7 +58,7 @@ import net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket;
@@ -69,7 +69,7 @@ index bc3fe18dd32da2d381b9546aae675a475c073696..fae458c2ec53e8663536c183d2487a2a
 import net.minecraft.network.protocol.game.ClientboundUpdateMobEffectPacket;
 import net.minecraft.network.protocol.game.ClientboundUpdateRecipesPacket;
 import net.minecraft.network.protocol.game.ClientboundUpdateTagsPacket;
-@@ -951,7 +951,7 @@ public abstract class PlayerList {
+@@ -957,7 +957,7 @@ public abstract class PlayerList {
         if (flag2 && !isLocAltered) {
             BlockState data = worldserver1.getBlockState(blockposition);
             worldserver1.setBlock(blockposition, data.setValue(RespawnAnchorBlock.CHARGE, data.getValue(RespawnAnchorBlock.CHARGE) - 1), 3);
@@ -123,7 +123,7 @@ index a79ba23ecf887ecbb6e095140f019ebb6fd0a6f7..5112edc5e68a386e9bb16ac0ec9d998e
         }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 71571868090062f02579d50ae483d9f367de5016..e94fc60cd34678d7ce052e70728040f9999a9d00 100644
+index a59a449c0a7b76527f009031aee2d11d6b43cadf..0e6820b173bc01f5e314205fe1e593107beea45d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1835,4 +1835,77 @@ public class CraftEventFactory {