Update Paper and fix compilation errors (again)

2023-10-06 02:32:03 -05:00 · 2023-10-06 02:32:03 -05:00 · 1050894e5a
parent c268904a94
commit 1050894e5a
8 changed files with 49 additions and 8 deletions
--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -2,7 +2,7 @@ plugins {
    java
    `maven-publish`
    id("com.github.johnrengelman.shadow") version "8.1.1" apply false
-    id("io.papermc.paperweight.patcher") version "1.5.7-SNAPSHOT"
+    id("io.papermc.paperweight.patcher") version "1.5.7"
 }

 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
--- a/gradle.properties
+++ b/gradle.properties
@ -2,7 +2,7 @@ group=me.totalfreedom.scissors
 version=1.20.2-R0.1-SNAPSHOT

 mcVersion=1.20.2
-paperRef=c4ba28a21a923a99c8ef9a9e42b66862c04743f5
+paperRef=cfe311d7a51eeb9e14c526f57efab9837f30c5d0

 org.gradle.caching=true
 org.gradle.parallel=true
--- a/patches/api/0001-Build-changes.patch
+++ b/patches/api/0001-Build-changes.patch
@ -0,0 +1,41 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Fri, 6 Oct 2023 02:29:32 -0500
+Subject: [PATCH] Build changes
+
+
+diff --git a/build.gradle.kts b/build.gradle.kts
+index 639651972fddce4dff63a0f0a7e566a15b9e2dd6..3152467db0ed68d2f077a738964da5cd08e1eb59 100644
+--- a/build.gradle.kts
+++ b/build.gradle.kts
+@@ -107,12 +107,12 @@ tasks.withType<Javadoc> {
+     options.isDocFilesSubDirs = true
+     options.links(
+         "https://guava.dev/releases/32.1.2-jre/api/docs/",
+-        "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
+-        "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
+        // "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/", // Scissors - comment out, webserver is down
+        // "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Scissors - comment out, webserver is down > // Paper - we don't want Java 5 annotations
+         // "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", // Paper - don't link to bungee chat
+         // Paper start - add missing javadoc links
+-        "https://javadoc.io/doc/org.joml/joml/1.10.5/index.html",
+-        "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1",
+        // "https://javadoc.io/doc/org.joml/joml/1.10.5/index.html", // Scissors - comment out, webserver is down
+        // "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1", // Scissors - comment out, webserver is down
+         // Paper end
+         // Paper start
+         "https://jd.advntr.dev/api/$adventureVersion/",
+@@ -121,10 +121,10 @@ tasks.withType<Javadoc> {
+         "https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/",
+         "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
+         "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
+-        "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
+-        "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/$log4jVersion/",
+        // "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/", // Scissors - comment out, webserver is down
+        // "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/$log4jVersion/", // Scissors - comment out, webserver is down
+         // Paper end
+-        "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3", // Paper
+        // "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3", // Scissors - comment out, webserver is down > // Paper
+     )
+     options.tags("apiNote:a:API Note:")
+ 
--- a/patches/api/0002-Add-MasterBlockFireEvent.patch
+++ b/patches/api/0002-Add-MasterBlockFireEvent.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add MasterBlockFireEvent

 diff --git a/src/main/java/me/totalfreedom/scissors/event/block/MasterBlockFireEvent.java b/src/main/java/me/totalfreedom/scissors/event/block/MasterBlockFireEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..a24cb52a5af62012c5d5acc29e4c3558e92ae572
+index 0000000000000000000000000000000000000000..812e6ae9f1c8eb9558e5109c522d3ce3a7deb35c
 --- /dev/null
 +++ b/src/main/java/me/totalfreedom/scissors/event/block/MasterBlockFireEvent.java
@@ -0,0 +1,51 @@
--- a/patches/api/0003-Add-spectator-teleport-event.patch
+++ b/patches/api/0003-Add-spectator-teleport-event.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add spectator teleport event

 diff --git a/src/main/java/me/totalfreedom/scissors/event/player/SpectatorTeleportEvent.java b/src/main/java/me/totalfreedom/scissors/event/player/SpectatorTeleportEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..d7efa63c316ed99c3eccfeadc1b0873b2ccb5d8a
+index 0000000000000000000000000000000000000000..e4c9256c78f8b395aea86e9ea1a112f8e7426c1f
 --- /dev/null
 +++ b/src/main/java/me/totalfreedom/scissors/event/player/SpectatorTeleportEvent.java
@@ -0,0 +1,60 @@
--- a/patches/api/0004-Add-Scissors-configuration-file.patch
+++ b/patches/api/0004-Add-Scissors-configuration-file.patch
--- a/patches/api/0005-Add-command-block-player-edit-event.patch
+++ b/patches/api/0005-Add-command-block-player-edit-event.patch
--- a/patches/server/0001-Build-changes.patch
+++ b/patches/server/0001-Build-changes.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Build changes


 diff --git a/build.gradle.kts b/build.gradle.kts
-index 683159586641dd9aa42ae96fa51602469755723f..1806f60a0529c2d193bd54ea8f59ff2749e821eb 100644
+index c187641f0ec6444a10e0e1583e1697d07e8f0267..9d13bd2d5cb152c6aa5834ad735d1695c05c097e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
@@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@ -108,7 +108,7 @@ index 97745f0bab8d82d397c6c2a5775aed92bca0a034..2f511b9c5f48773c17a659c00a94ba3d
 
     public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fcd5096d64edfaf6bce3ecce8c9b9afb84462786..5d8b8b17854c1ae2a5e2ccfb8df1d7b927191f03 100644
+index b7e7e6ed60f55d2ab5e4fcefb3638ad1768c3b7f..f7c3b65e0d6c76189aea00232b33722c4363d7dd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -267,7 +267,7 @@ import javax.annotation.Nullable; // Paper
@ -134,10 +134,10 @@ index 774556a62eb240da42e84db4502e2ed43495be17..741c76c4dfa0bb34cc23bd795c194bde
 
         if (stream != null) {
 diff --git a/src/test/java/org/bukkit/craftbukkit/legacy/PersistentDataContainerLegacyTest.java b/src/test/java/org/bukkit/craftbukkit/legacy/PersistentDataContainerLegacyTest.java
-index 3f2b8b6f893c1ec6fba949251f028cb2a2d64068..456e6fba5ecaf7ec20d4904ace66059f9756e316 100644
+index 4afaac5928e55e6ef233deb058150e2ec63162c4..c7201e0d1d8fe664b461b1d443c21782bdbfa63c 100644
 --- a/src/test/java/org/bukkit/craftbukkit/legacy/PersistentDataContainerLegacyTest.java
 +++ b/src/test/java/org/bukkit/craftbukkit/legacy/PersistentDataContainerLegacyTest.java
-@@ -48,7 +48,9 @@ public class PersistentDataContainerLegacyTest extends AbstractTestingBase {
+@@ -49,7 +49,9 @@ public class PersistentDataContainerLegacyTest extends AbstractTestingBase {
         assertEquals(Float.valueOf(Float.MAX_VALUE), pdc.get(this.key("float"), PersistentDataType.FLOAT), "legacy float was wrong");
         assertEquals(Double.valueOf(Double.MAX_VALUE), pdc.get(this.key("double"), PersistentDataType.DOUBLE), "legacy double was wrong");
         assertEquals("stringy", pdc.get(this.key("string_simple"), PersistentDataType.STRING), "legacy string-simple was wrong");