Update upstream (#26)

gommehdnet · Oct 11, 2024 · a77661b · a77661b
1 parent fd11154
commit a77661b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     java
     `maven-publish`
-    id("io.papermc.paperweight.patcher") version "1.7.2"
+    id("io.papermc.paperweight.patcher") version "1.7.3"
 }
 
 val paperMavenPublicUrl = "https://papermc.io/repo/repository/maven-public/"

diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ group=net.gommehd.cheetah
 version=1.21.1-R0.1-SNAPSHOT
 
 mcVersion=1.21.1
-paperRef=9b1ee0d87db2867e1c2e8a7b0f02686de81f9826
+paperRef=57c75a4b67a8b3b3c607126130b7503658b5e98a
 
 org.gradle.caching=true
 org.gradle.parallel=true

diff --git a/patches/api/0003-Async-able-StructuresLocateEvent.patch b/patches/api/0003-Async-able-StructuresLocateEvent.patch
@@ -5,15 +5,15 @@ Subject: [PATCH] Async-able StructuresLocateEvent
 
 
 diff --git a/src/main/java/io/papermc/paper/event/world/StructuresLocateEvent.java b/src/main/java/io/papermc/paper/event/world/StructuresLocateEvent.java
-index 41ea65c9ecf6339bb50864a6d28e53c7e8d1edf7..79f094559c4908d6f204568af7411cc3bb4e4d3e 100644
+index d39b3dc48079fc83f1fd8e7ecde0d4ae77b635ce..3bacbf6f62f6e59cb39f672c8a474b31846a0832 100644
 --- a/src/main/java/io/papermc/paper/event/world/StructuresLocateEvent.java
 +++ b/src/main/java/io/papermc/paper/event/world/StructuresLocateEvent.java
-@@ -49,6 +49,16 @@ public class StructuresLocateEvent extends WorldEvent implements Cancellable {
+@@ -50,6 +50,16 @@ public class StructuresLocateEvent extends WorldEvent implements Cancellable {
          this.findUnexplored = findUnexplored;
      }
 
 +    // Cheetah start - added async parameter
-+    public StructuresLocateEvent(@NotNull World world, @NotNull Location origin, @NotNull List<Structure> structures, int radius, boolean findUnexplored, boolean async) {
++    public StructuresLocateEvent(final World world, final Location origin, final List<Structure> structures, final int radius, final boolean findUnexplored, final boolean async) {
 +        super(world, async);
 +        this.origin = origin;
 +        this.setStructures(structures);

diff --git a/patches/api/0006-ignore-javadoc-errors.patch b/patches/api/0006-ignore-javadoc-errors.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] ignore javadoc errors
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index fd39ed209b20c927054b8482c400beeeeab460a3..96e2a02c2c930037f756e6cb04e8e14f6c74cda0 100644
+index ab84a1405acc1f0d5f267892243b82b8dab03e21..0d21a3582a57075f11a3a66fe97c6946a0decbae 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -142,6 +142,7 @@ tasks.jar {
+@@ -143,6 +143,7 @@ tasks.jar {
  }
 
  tasks.withType<Javadoc> {

diff --git a/patches/api/0007-temp-remove-javadoc-links.patch b/patches/api/0007-temp-remove-javadoc-links.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] temp remove javadoc links
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index b74501523dded89fcb2ba3c101c5cb53ee883414..85a421671877413190cfed4daf2a4364cadc8e4a 100644
+index 0d21a3582a57075f11a3a66fe97c6946a0decbae..62bda01c760d283ca63902dca5f207b507c51a48 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -149,12 +149,12 @@ tasks.withType<Javadoc> {
+@@ -150,12 +150,12 @@ tasks.withType<Javadoc> {
      options.isDocFilesSubDirs = true
      options.links(
          "https://guava.dev/releases/32.1.2-jre/api/docs/",
@@ -22,10 +22,10 @@ index b74501523dded89fcb2ba3c101c5cb53ee883414..85a421671877413190cfed4daf2a4364
 -        "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", // Cheetah - temp remove javadoc links
 +        // "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1", // Cheetah - temp remove javadoc links
+         "https://jspecify.dev/docs/api/",
          // Paper end
          // Paper start
-         "https://jd.advntr.dev/api/$adventureVersion/",
-@@ -164,10 +164,10 @@ tasks.withType<Javadoc> {
+@@ -166,10 +166,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/",

diff --git a/patches/server/0010-return-false-when-the-allied-team-is-the-collide-rul.patch b/patches/server/0010-return-false-when-the-allied-team-is-the-collide-rul.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] return false when the allied team is the collide rule team
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index be9976a994dd04cf53048567576dd3484facf625..f5177e0b94182edd9ea814b6a2732750511b647d 100644
+index 4b54d0ea31062972e68ee8fafe3cfaf68f65a5cd..7b6f86d63a8ab934746e290a79a9212c71488df2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3430,7 +3430,17 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3432,7 +3432,17 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
 
      public boolean isAlliedTo(Team team) {