From c7bb955eb05b45a89c1d409ec292efa7de7e1173 Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Sat, 1 Feb 2025 21:18:01 -0800
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@d4a95784 Experimental annotation changes (#12028)
PaperMC/Paper@5bcfb12a Fix activation range config and water animal status (#12047)
PaperMC/Paper@e0711af5 Deprecate UnsafeValues#getSpawnEggLayerColor (#12041)
---
 .editorconfig     | 22 +++++++++++-----------
 CONTRIBUTING.md   |  3 ++-
 gradle.properties |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 98a181da1..500d22627 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,32 +1,32 @@
 [*]
-charset=utf-8
-end_of_line=lf
-insert_final_newline=true
-indent_style=space
-indent_size=4
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
 ij_any_block_comment_add_space = false
 ij_any_block_comment_at_first_column = false
 ij_any_line_comment_at_first_column = false
 ij_any_line_comment_add_space = true
 
 [*.tiny]
-indent_style=tab
+indent_style = tab
 
 [*.bat]
-end_of_line=crlf
+end_of_line = crlf
 
 [*.yml]
-indent_size=2
+indent_size = 2
 
 [*.patch]
-trim_trailing_whitespace=false
+trim_trailing_whitespace = false
 
 [*.java]
 ij_continuation_indent_size = 4
 ij_java_class_count_to_use_import_on_demand = 999999
 ij_java_insert_inner_class_imports = false
 ij_java_names_count_to_use_import_on_demand = 999999
-ij_java_imports_layout = *,|,$*
+ij_java_imports_layout = *, |, $*
 ij_java_generate_final_locals = true
 ij_java_generate_final_parameters = true
 ij_java_method_parameters_new_line_after_left_paren = true
@@ -40,5 +40,5 @@ ij_java_use_fq_class_names = true
 [purpur-server/src/minecraft/resources/data/**/*.json]
 indent_size = 2
 
-[paper-api/src/generated/**/*.java]
+[paper-api/src/generated/java/**/*.java]
 ij_java_imports_layout = $*,|,*
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2d4c58015..a64260d7b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -243,7 +243,8 @@ required.
   with `// Purpur end - <COMMIT DESCRIPTION>`.
 - One-line changes should have `// Purpur - <COMMIT DESCRIPTION>` at the end of the line.
 
-> [!NOTE] These comments are incredibly important to be able to keep track of changes
+> [!NOTE]
+> These comments are incredibly important to be able to keep track of changes
 > across files and to remember what they are for, even a decade into the future.
 
 Here's an example of how to mark changes by Purpur:
diff --git a/gradle.properties b/gradle.properties
index c9076a35f..117ceb738 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21.4-R0.1-SNAPSHOT
 
 mcVersion = 1.21.4
-paperCommit = 54b2e9d9738ce32e2f415c321f20e3fc07063c14
+paperCommit = e0711af5d5b485ff507f5168c8c146689941421d
 
 org.gradle.configuration-cache = true
 org.gradle.caching = true