Merge upstream

.editorconfig

@@ -4,6 +4,10 @@ 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
@@ -16,3 +20,23 @@ indent_size=2
 
 [*.patch]
 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_generate_final_locals = true
+ij_java_generate_final_parameters = true
+ij_java_method_parameters_new_line_after_left_paren = true
+ij_java_method_parameters_right_paren_on_new_line = true
+
+[test-plugin/**/*.java]
+ij_java_use_fq_class_names = false
+
+[Paper-Server/src/main/resources/data/**/*.json]
+indent_size = 2
+
+[paper-api-generator/generated/**/*.java]
+ij_java_imports_layout = $*,|,*

.gitattributes

@@ -1,4 +1,4 @@
-* text=auto
+* text=auto eol=lf
 
 *.sh text eol=lf
 gradlew text eol=lf

.github/DISCUSSION_TEMPLATE/ideas.yml

@@ -0,0 +1,42 @@
+labels: ["status: needs triage"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for filling out a feature request for Paper! Please be as detailed as possible so that we may consider and review the request easier.
+        We ask that you search all the issues to avoid a duplicate feature request. If one exists, please reply if you have anything to add.
+        Before requesting a new feature, please make sure you are using the latest version and that the feature you are requesting is not already in Paper.
+
+  - type: textarea
+    attributes:
+      label: Is your feature request related to a problem?
+      description: Please give some context for this request. Why do you want it added?
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Describe the solution you'd like.
+      description: A clear and concise description of what you want.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered.
+      description: List any alternatives you might have tried to get the feature you want.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Other
+      description: Add any other context or screenshots about the feature request below.
+    validations:
+      required: false
+
+  - type: markdown
+    attributes:
+      value: |
+        Before submitting this feature request, please search our issue tracker to ensure your feature has not
+        already been requested.

.github/ISSUE_TEMPLATE/bug-or-incompatibility.yml

@@ -0,0 +1,79 @@
+name: "🐛 Bug or Incompatibility"
+description: Report issues related to unexpected behavior or vanilla/plugin incompatibility.
+type: "Bug"
+labels:
+  - "status: needs triage"
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Before submitting this issue, please ensure the following:
+
+        1. You are using the latest version of Paper, available on our [our downloads page](https://papermc.io/downloads/paper).
+        2. You have searched to confirm there isn’t [an existing open issue](https://github.com/PaperMC/Paper/issues?q=is%3Aissue%20state%3Aopen%20type%3ABug) on this topic.
+        3. Your version of Minecraft is supported by Paper.
+
+        If you're unsure whether you've encountered a bug, feel free to ask in the `#paper-help` channel on our
+        [Discord](https://discord.gg/papermc).
+
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      description: What you expected to see.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Observed/Actual behavior
+      description: What you actually saw.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Steps/models to reproduce
+      description: This may include a build schematic, a video, or detailed instructions to help reconstruct the issue.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Plugin and Datapack List
+      description: |
+        All plugins and datapacks running on your server.
+        To list plugins, run `/plugins`. For datapacks, run `/datapack list`.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Paper version
+      description: |
+        Run `/version` on your server and **paste** the full, unmodified output here.
+        "latest" is *not* a version; we require the output of `/version` so we can adequately track down the issue.
+        Additionally, do NOT provide a screenshot, you MUST paste the entire output.
+        <details>
+        <summary>Example</summary>
+
+        ```
+        > version
+        [20:34:42 INFO]: Checking version, please wait...
+        [20:34:42 INFO]: This server is running Paper version 1.21-105-master@7e91a2c (2024-07-20T21:04:31Z) (Implementing API version 1.21-R0.1-SNAPSHOT)
+        [20:34:42 INFO]: You are running the latest version
+        [20:34:42 INFO]: Previous version: 1.21-103-aa3b356 (MC: 1.21)
+        ```
+
+        </details>
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Other
+      description: |
+        Please include other helpful information below.
+        The more information we receive, the quicker and more effective we can be at finding the solution to the issue.
+    validations:
+      required: false
+

.github/ISSUE_TEMPLATE/config.yml

@@ -1,10 +1,10 @@
 blank_issues_enabled: false
 contact_links:
-  - name: PaperMC Discord
-    url: https://discord.gg/papermc
-    about: If you are having issues with timings or have other minor issues, come ask us on our Discord server!
-  - name: Exploit Report
+  - name: "❗Exploits"
     url: https://discord.gg/papermc
     about: |
-      Due to GitHub not currently allowing private issues, exploit reports are currently handled via our Discord.
-      To report an exploit, see the #paper-exploit-report channel.
+      Since GitHub doesn’t currently support private issues, exploit reports are managed through our Discord.
+      To report an exploit, please visit the #paper-exploit-report channel.
+  - name: "🗨 Questions"
+    url: https://discord.gg/papermc
+    about: If you have questions or need help with any minor issues, feel free to ask us on our Discord server!

.github/ISSUE_TEMPLATE/crash-or-stacktrace.yml

@@ -0,0 +1,78 @@
+name: "💥 Crash or Stacktrace"
+description: Report any server crashes or alarming stack traces.
+type: "Bug"
+labels:
+  - "status: needs triage"
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Before submitting this issue, please ensure the following:
+
+        1. You are running the latest version of Paper from [our downloads page](https://papermc.io/downloads/paper).
+        2. Your version of Minecraft is supported by Paper.
+
+        If your server crash log contains `DO NOT REPORT THIS TO PAPER`, please ask in our
+        [Discord](https://discord.gg/papermc) before opening this issue. These messages are informing you of server
+        lag and providing debug information.
+
+  - type: textarea
+    attributes:
+      label: Stack trace
+      description: |
+        We need all of the stack trace! Do not cut off parts of it. Please do not use attachments.
+        If you prefer, you can use a paste site like https://mclo.gs.
+      value: |
+        ```
+        paste your stack trace or a mclo.gs link here!
+        ```
+      placeholder: Please don't remove the backticks; it makes your issue a lot harder to read!
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Plugin and Datapack List
+      description: |
+        All plugins and datapacks running on your server.
+        To list plugins, run `/plugins`. For datapacks, run `/datapack list`.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Actions to reproduce (if known)
+      description: This may include a build schematic, a video, or detailed instructions to help reconstruct the issue. Anything helps!
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Paper version
+      description: |
+        Run `/version` on your server and **paste** the full, unmodified output here.
+        "latest" is *not* a version; we require the output of `/version` so we can adequately track down the issue.
+        Additionally, do NOT provide a screenshot, you MUST paste the entire output.
+        <details>
+        <summary>Example</summary>
+
+        ```
+        > version
+        [20:34:42 INFO]: Checking version, please wait...
+        [20:34:42 INFO]: This server is running Paper version 1.21-105-master@7e91a2c (2024-07-20T21:04:31Z) (Implementing API version 1.21-R0.1-SNAPSHOT)
+        [20:34:42 INFO]: You are running the latest version
+        [20:34:42 INFO]: Previous version: 1.21-103-aa3b356 (MC: 1.21)
+        ```
+
+        </details>
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Other
+      description: |
+        Please include other helpful information below, if any.
+        The more information we receive, the quicker and more effective we can be at finding the solution to the issue.
+    validations:
+      required: false