From 306dc07ce666235401f8f4ac2c8e1fae0b60a69e Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Thu, 16 Jan 2025 14:31:34 -0800
Subject: [PATCH] Update Paper

---
 build.gradle.kts                                 |  7 +------
 folia-api/build.gradle.kts.patch                 |  9 +++++++++
 folia-server/build.gradle.kts.patch              |  6 +-----
 .../craftbukkit/entity/CraftEntity.java.patch    | 16 ++++++++--------
 gradle.properties                                |  2 +-
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 21f0654..c733b36 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,7 +4,7 @@ import io.papermc.paperweight.tasks.RebuildGitPatches
 
 plugins {
     java // TODO java launcher tasks
-    id("io.papermc.paperweight.patcher") version "2.0.0-beta.13"
+    id("io.papermc.paperweight.patcher") version "2.0.0-beta.14"
 }
 
 paperweight {
@@ -27,11 +27,6 @@ paperweight {
             patchesDir = file("folia-api/paper-patches")
             outputDir = file("paper-api")
         }
-        patchDir("paperApiGenerator") {
-            upstreamPath = "paper-api-generator"
-            patchesDir = file("folia-api-generator/paper-patches")
-            outputDir = file("paper-api-generator")
-        }
     }
 }
 
diff --git a/folia-api/build.gradle.kts.patch b/folia-api/build.gradle.kts.patch
index 4fe51fc..0313e40 100644
--- a/folia-api/build.gradle.kts.patch
+++ b/folia-api/build.gradle.kts.patch
@@ -1,5 +1,14 @@
 --- a/paper-api/build.gradle.kts
 +++ b/paper-api/build.gradle.kts
+@@ -93,7 +_,7 @@
+     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+ }
+ 
+-val generatedApiPath: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
++val generatedApiPath: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-api/src/generated/java").asFile.toPath()
+ idea {
+     module {
+         generatedSourceDirs.add(generatedApiPath.toFile())
 @@ -103,6 +_,18 @@
      main {
          java {
diff --git a/folia-server/build.gradle.kts.patch b/folia-server/build.gradle.kts.patch
index 516c958..a4f4db8 100644
--- a/folia-server/build.gradle.kts.patch
+++ b/folia-server/build.gradle.kts.patch
@@ -1,6 +1,6 @@
 --- a/paper-server/build.gradle.kts
 +++ b/paper-server/build.gradle.kts
-@@ -20,6 +_,21 @@
+@@ -20,6 +_,17 @@
      minecraftVersion = providers.gradleProperty("mcVersion")
      // macheOldPath = file("F:\\Projects\\PaperTooling\\mache\\versions\\1.21.4\\src\\main\\java")
      // gitFilePatches = true
@@ -15,10 +15,6 @@
 +    }
 +
 +    activeFork = fork
-+    
-+    paper {
-+        paperServerDir = upstreamsDirectory().map { it.dir("paper/paper-server") }
-+    }
  
      spigot {
          buildDataRef = "3edaf46ec1eed4115ce1b18d2846cded42577e42"
diff --git a/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java.patch b/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java.patch
index 392014a..5fc7725 100644
--- a/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java.patch
+++ b/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -82,6 +_,11 @@
+@@ -83,6 +_,11 @@
          return this.apiScheduler;
      };
      // Paper end - Folia schedulers
@@ -12,7 +12,7 @@
  
      public CraftEntity(final CraftServer server, final Entity entity) {
          this.server = server;
-@@ -239,6 +_,11 @@
+@@ -240,6 +_,11 @@
  
      @Override
      public boolean teleport(Location location, TeleportCause cause, io.papermc.paper.entity.TeleportFlag... flags) {
@@ -24,7 +24,7 @@
          // Paper end
          Preconditions.checkArgument(location != null, "location cannot be null");
          location.checkFinite();
-@@ -528,6 +_,7 @@
+@@ -529,6 +_,7 @@
      }
  
      public Entity getHandle() {
@@ -32,7 +32,7 @@
          return this.entity;
      }
  
-@@ -722,7 +_,7 @@
+@@ -723,7 +_,7 @@
          ImmutableSet.Builder<Player> players = ImmutableSet.builder();
  
          ServerLevel world = ((CraftWorld) this.getWorld()).getHandle();
@@ -41,7 +41,7 @@
  
          if (entityTracker != null) {
              for (ServerPlayerConnection connection : entityTracker.seenBy) {
-@@ -1026,7 +_,7 @@
+@@ -1027,7 +_,7 @@
          }
  
          ServerLevel world = ((CraftWorld) this.getWorld()).getHandle();
@@ -50,7 +50,7 @@
  
          if (entityTracker == null) {
              return;
-@@ -1045,7 +_,7 @@
+@@ -1046,7 +_,7 @@
          }
  
          ServerLevel world = ((CraftWorld) this.getWorld()).getHandle();
@@ -59,7 +59,7 @@
  
          if (entityTracker == null) {
              return;
-@@ -1079,29 +_,43 @@
+@@ -1080,29 +_,43 @@
          location.checkFinite();
          Location locationClone = location.clone(); // clone so we don't need to worry about mutations after this call.
  
@@ -122,7 +122,7 @@
      }
      // Paper end - more teleport API / async chunk API
  
-@@ -1214,8 +_,7 @@
+@@ -1215,8 +_,7 @@
      // Paper start - tracked players API
      @Override
      public Set<org.bukkit.entity.Player> getTrackedPlayers() {
diff --git a/gradle.properties b/gradle.properties
index b72ad06..0a7db2a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=dev.folia
 version=1.21.4-R0.1-SNAPSHOT
 mcVersion=1.21.4
 
-paperRef=8e80d4e15852ffbed1a18d1e9b34550191433200
+paperRef=b1b88cd31687c5b3f80c4b0b51fd93a63b3e2498
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true