Updated Upstream (Paper)

gradle.properties

@@ -2,7 +2,7 @@ group=org.galemc.gale
 version=1.20.1-R0.1-SNAPSHOT
 
 mcVersion=1.20.1
-paperRef=837cc25c51cfcf630d61c2f6da38d00413a29ae4
+paperRef=f6139de06ca098b3eb227c4b255abf71deeddf8c
 
 org.gradle.caching=true
 org.gradle.parallel=true

patches/api/0007-Player-canSee-by-entity-UUID.patch

@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 4ee0eb177f6b5765a9d7263576bb36c8a8366979..ddd7267f30c7ca2d6fdb1af71ceaf2bceb38c52a 100644
+index 06f00d016f1e46edb8f4fe0c14eb8b364900c3ef..42f87a63984345006c513e42b843ea7292d7ee63 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3,6 +3,8 @@ package org.bukkit.entity;
@@ -49,7 +49,7 @@ index 4ee0eb177f6b5765a9d7263576bb36c8a8366979..ddd7267f30c7ca2d6fdb1af71ceaf2bc
  import org.bukkit.DyeColor;
  import org.bukkit.Effect;
  import org.bukkit.GameMode;
-@@ -1685,6 +1687,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1715,6 +1717,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @ApiStatus.Experimental
      public boolean canSee(@NotNull Entity entity);
  

patches/server/0003-Hide-irrelevant-compilation-warnings.patch

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index c7a72ad4bcd4529f62b28ab4af3504a4e749927f..2cbebfc91e62395ab15185c55a2fa323f9b1882f 100644
+index 5d97b2aaab3e2d5407651394abfcb34450c349cb..71f0fe6fd20ee2bb5ed3e1530d7b76b9cc81c0dc 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -57,6 +57,16 @@ dependencies {
+@@ -58,6 +58,16 @@ dependencies {
  }
  
  val craftbukkitPackageVersion = "1_20_R1" // Paper

patches/server/0004-Use-default-Java-installation-for-development-runs.patch

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 2cbebfc91e62395ab15185c55a2fa323f9b1882f..b6106ec031efd679871bddde7ebafce518381b8c 100644
+index 71f0fe6fd20ee2bb5ed3e1530d7b76b9cc81c0dc..b5132c3eb86ae9ec4e46766ad803c6faac4c13da 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -151,6 +151,15 @@ fun TaskContainer.registerRunTask(
+@@ -152,6 +152,15 @@ fun TaskContainer.registerRunTask(
      name: String,
      block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {

patches/server/0005-Enable-virtual-threads-for-development-runs.patch

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index b6106ec031efd679871bddde7ebafce518381b8c..794aa5ec516d6d1f2c633bcdb53232515a06e32a 100644
+index b5132c3eb86ae9ec4e46766ad803c6faac4c13da..3c9894b4275970bdb135f28a608c5b348d89e4f1 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -184,6 +184,10 @@ fun TaskContainer.registerRunTask(
+@@ -185,6 +185,10 @@ fun TaskContainer.registerRunTask(
      val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2")
      minHeapSize = "${memoryGb}G"
      maxHeapSize = "${memoryGb}G"

patches/server/0006-Gale-branding-changes.patch

@@ -11,10 +11,10 @@ License for non-image files: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 427749555a81724dbe36a99b70fb7aaba5f80151..47f235b641946b58afd18783e3dbca6432fcc268 100644
+index 3c9894b4275970bdb135f28a608c5b348d89e4f1..bc355da5be055541dc3bfbdeafb4966dd60a3f5f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -79,7 +79,7 @@ tasks.jar {
+@@ -80,7 +80,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -222,7 +222,7 @@ index 80cf4852e4010eeeadaf920ab927a40df0179b40..d404cbb04e25ef145738fbd1cb2453ac
  
      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 9f8c5ceb8485b14a84f2a7b2ffc8192be5c6bdfd..0a3f5b354336e9acf70524c93f3386c6f7cdafe0 100644
+index 59984cb8ba9ffb66b59a2c907e4f04b5a51ea8ed..08235e6fd53cefec988dce75805dafd0cc69647e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -261,7 +261,7 @@ import javax.annotation.Nullable; // Paper

patches/server/0008-Gale-configuration.patch

@@ -464,10 +464,10 @@ index 147d802d9207e358fdb2d1c7806fc2f634dcfd98..71189e98dcb71e625defe5a0bd635559
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0a3f5b354336e9acf70524c93f3386c6f7cdafe0..eae08c4e9f6efb3cb6822b9e02776826920b2e5c 100644
+index 08235e6fd53cefec988dce75805dafd0cc69647e..887bb8c592510def5e16101dfad4860620161d18 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -979,6 +979,7 @@ public final class CraftServer implements Server {
+@@ -983,6 +983,7 @@ public final class CraftServer implements Server {
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
@@ -475,7 +475,7 @@ index 0a3f5b354336e9acf70524c93f3386c6f7cdafe0..eae08c4e9f6efb3cb6822b9e02776826
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -2776,6 +2777,14 @@ public final class CraftServer implements Server {
+@@ -2780,6 +2781,14 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
  

patches/server/0028-Print-stack-trace-for-plugins-not-shutting-down-task.patch

@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1cd4198fa1cbb4e27f016463c489dbddce9c659e..23438408f99d11522d4559900dc67566bc662587 100644
+index 887bb8c592510def5e16101dfad4860620161d18..2dcbd2763a892351a2e0cb6cfc9843aeb1edfec6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1063,6 +1063,13 @@ public final class CraftServer implements Server {
+@@ -1067,6 +1067,13 @@ public final class CraftServer implements Server {
                  plugin.getPluginMeta().getDisplayName(),
                  "This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
              ));

patches/server/0044-SIMD-support.patch

@@ -13,10 +13,10 @@ As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index a35e8a5a66bcd1235edbf2ba1a245956f90117f7..4a7cb5e5be6c9f2fbadafe86bbf962e6697afce8 100644
+index bc355da5be055541dc3bfbdeafb4966dd60a3f5f..4579f4ef0683a9e5bfb112890cefae24354327be 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -64,6 +64,7 @@ tasks.withType<JavaCompile> {
+@@ -65,6 +65,7 @@ tasks.withType<JavaCompile> {
      compilerArgs.add("-Xlint:-module")
      compilerArgs.add("-Xlint:-removal")
      compilerArgs.add("-Xlint:-dep-ann")
@@ -24,7 +24,7 @@ index a35e8a5a66bcd1235edbf2ba1a245956f90117f7..4a7cb5e5be6c9f2fbadafe86bbf962e6
  }
  // Gale end - hide irrelevant compilation warnings
  
-@@ -188,6 +189,7 @@ fun TaskContainer.registerRunTask(
+@@ -189,6 +190,7 @@ fun TaskContainer.registerRunTask(
      jvmArgs("--enable-preview")
      jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
      // Gale end - enable virtual threads for development runs

patches/server/0126-CraftBukkit-UUID-to-world-map.patch

@@ -13,7 +13,7 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index aafe7157fe5be8638f9e1040dce9f62092040396..a8ca4a1f7c0542ac6abb869b68263bedd0c5a1e1 100644
+index 2dcbd2763a892351a2e0cb6cfc9843aeb1edfec6..d3586e8eb5c0bdeda3a966300dd6537e32e647d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -42,6 +42,9 @@ import java.util.logging.Level;
@@ -34,7 +34,7 @@ index aafe7157fe5be8638f9e1040dce9f62092040396..a8ca4a1f7c0542ac6abb869b68263bed
      private final Map<Class<?>, Registry<?>> registries = new HashMap<>();
      private YamlConfiguration configuration;
      private YamlConfiguration commandsConfiguration;
-@@ -1340,6 +1344,7 @@ public final class CraftServer implements Server {
+@@ -1344,6 +1348,7 @@ public final class CraftServer implements Server {
              this.getLogger().log(Level.SEVERE, null, ex);
          }
  
@@ -42,7 +42,7 @@ index aafe7157fe5be8638f9e1040dce9f62092040396..a8ca4a1f7c0542ac6abb869b68263bed
          this.worlds.remove(world.getName().toLowerCase(java.util.Locale.ENGLISH));
          this.console.removeLevel(handle);
          return true;
-@@ -1358,12 +1363,7 @@ public final class CraftServer implements Server {
+@@ -1362,12 +1367,7 @@ public final class CraftServer implements Server {
  
      @Override
      public World getWorld(UUID uid) {
@@ -56,7 +56,7 @@ index aafe7157fe5be8638f9e1040dce9f62092040396..a8ca4a1f7c0542ac6abb869b68263bed
      }
  
      // Paper start
-@@ -1381,6 +1381,7 @@ public final class CraftServer implements Server {
+@@ -1385,6 +1385,7 @@ public final class CraftServer implements Server {
              System.out.println("World " + world.getName() + " is a duplicate of another world and has been prevented from loading. Please delete the uid.dat file from " + world.getName() + "'s world directory if you want to be able to load the duplicate world.");
              return;
          }

patches/server/0128-Specific-interval-TPS-API.patch

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a8ca4a1f7c0542ac6abb869b68263bedd0c5a1e1..546dc3c3fb6ce94665daeea7e3c05af54f4111e3 100644
+index d3586e8eb5c0bdeda3a966300dd6537e32e647d6..95d9be7816c1c4d663800508d28dcd2027540ebb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2745,6 +2745,25 @@ public final class CraftServer implements Server {
+@@ -2749,6 +2749,25 @@ public final class CraftServer implements Server {
          };
      }
  

patches/server/0129-5-second-TPS-average.patch

@@ -79,10 +79,10 @@ index 53aa1cb62794ea481c37587b2d424f188130764c..8f2f71821e10c7ead30ae04854ccd203
                      tps5.add(currentTps, diff);
                      tps15.add(currentTps, diff);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 546dc3c3fb6ce94665daeea7e3c05af54f4111e3..ed88860bd93244beff4540896e7420be44826cb8 100644
+index 95d9be7816c1c4d663800508d28dcd2027540ebb..853fb78c0d3042d378a2ac918b019881f1b7bf75 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2745,8 +2745,27 @@ public final class CraftServer implements Server {
+@@ -2749,8 +2749,27 @@ public final class CraftServer implements Server {
          };
      }
  

patches/server/0131-Last-tick-time-API.patch

@@ -23,10 +23,10 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ed88860bd93244beff4540896e7420be44826cb8..4a7ed68b10bb09eb801c52871e47ca55cec46363 100644
+index 853fb78c0d3042d378a2ac918b019881f1b7bf75..f3d443f78a2bf62dd578c6c5d500999747520af5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3044,4 +3044,22 @@ public final class CraftServer implements Server {
+@@ -3048,4 +3048,22 @@ public final class CraftServer implements Server {
      }
  
      // Paper end