Update Paper and add javadocs back

gradle.properties

@@ -2,7 +2,7 @@ group=me.totalfreedom.scissors
 version=1.20.2-R0.1-SNAPSHOT
 
 mcVersion=1.20.2
-paperRef=cfe311d7a51eeb9e14c526f57efab9837f30c5d0
+paperRef=29a02095754a8bc76f996f53e1da1cc04b5fd167
 
 org.gradle.caching=true
 org.gradle.parallel=true

patches/api/0001-Build-changes.patch

@@ -1,41 +0,0 @@
-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:")
- 

patches/server/0034-Prevent-player-banning-using-duplicate-UUIDs.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent player banning using duplicate UUIDs
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 868951dc21aff541765b1f58f08cdf3c47446d25..f714b076dcaa78cb8a666ce2e9f24c66d6af0989 100644
+index 17610196db7a1c6feb2cf74a02479a8691aa323f..70c52e2293d64d32fdcebbcd0678e0c80d35fbb8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1643,7 +1643,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1644,7 +1644,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (entity != null) {
              ServerLevel.LOGGER.warn("Force-added player with duplicate UUID {}", player.getUUID());
              entity.unRide();