├── .gitattributes ├── .github ├── ISSUE_TEMPLATE │ ├── behavior-bug.yml │ ├── config.yml │ ├── feature-request.yml │ ├── performance-problems.yml │ └── server-crash-or-stacktrace.yml └── workflows │ └── build.yml ├── .gitignore ├── PATCHES-LICENSE ├── PROJECT_DESCRIPTION.md ├── README.md ├── REGION_LOGIC.md ├── build-data ├── dev-imports.txt └── fork.at ├── build.gradle.kts ├── folia-api ├── build.gradle.kts.patch ├── paper-patches │ └── features │ │ ├── 0001-Force-disable-timings.patch │ │ ├── 0002-Region-scheduler-API.patch │ │ ├── 0003-Require-plugins-to-be-explicitly-marked-as-Folia-sup.patch │ │ └── 0004-Add-TPS-From-Region.patch └── src │ └── main │ └── java │ └── io │ └── papermc │ └── paper │ └── threadedregions │ └── RegionizedServerInitEvent.java ├── folia-server ├── build.gradle.kts.patch ├── minecraft-patches │ └── features │ │ ├── 0001-Region-Threading-Base.patch │ │ ├── 0002-Max-pending-logins.patch │ │ ├── 0003-Add-chunk-system-throughput-counters-to-tps.patch │ │ ├── 0004-Prevent-block-updates-in-non-loaded-or-non-owned-chu.patch │ │ ├── 0005-Block-reading-in-world-tile-entities-on-worldgen-thr.patch │ │ ├── 0006-Sync-vehicle-position-to-player-position-on-player-d.patch │ │ ├── 0007-Region-profiler.patch │ │ ├── 0008-Add-watchdog-thread.patch │ │ └── 0009-Temporary-fix-for-https-github.com-PaperMC-Folia-iss.patch └── paper-patches │ └── features │ ├── 0001-Region-Threading-Base.patch │ ├── 0002-Update-Logo.patch │ ├── 0003-Build-changes.patch │ ├── 0004-Fix-tests-by-removing-them.patch │ ├── 0005-Region-profiler.patch │ ├── 0006-Add-watchdog-thread.patch │ └── 0007-Add-TPS-From-Region.patch ├── folia.png ├── gradle.properties ├── gradle ├── libs.versions.toml └── wrapper │ ├── gradle-wrapper.jar │ └── gradle-wrapper.properties ├── gradlew ├── gradlew.bat ├── patch.bat ├── patch.sh ├── rb.bat ├── rb.sh └── settings.gradle.kts /.gitattributes: -------------------------------------------------------------------------------- 1 | # 2 | # https://help.github.com/articles/dealing-with-line-endings/ 3 | # 4 | # Linux start script should use lf 5 | /gradlew text eol=lf 6 | 7 | # These are Windows script files and should use crlf 8 | *.bat text eol=crlf 9 | 10 | # Binary files should be left untouched 11 | *.jar binary 12 | 13 | -------------------------------------------------------------------------------- /.github/ISSUE_TEMPLATE/behavior-bug.yml: -------------------------------------------------------------------------------- 1 | name: Behavior Bug 2 | description: Report behavior related issues, where Folia does not work like vanilla. Paper and Bukkit plugins are not guaranteed to work on Folia. Do not submit bug reports for plugin issues here. 3 | labels: [ "status: needs triage", "type: bug" ] 4 | body: 5 | - type: textarea 6 | attributes: 7 | label: Expected behavior 8 | description: What you expected to see. 9 | validations: 10 | required: true 11 | 12 | - type: textarea 13 | attributes: 14 | label: Observed/Actual behavior 15 | description: What you actually saw. 16 | validations: 17 | required: true 18 | 19 | - type: textarea 20 | attributes: 21 | label: Steps/models to reproduce 22 | description: This may include a build schematic, a video, or detailed instructions to help reconstruct the issue. 23 | validations: 24 | required: true 25 | 26 | - type: textarea 27 | attributes: 28 | label: Plugin and Datapack List 29 | description: | 30 | All plugins and datapacks running on your server. 31 | To list plugins, run `/plugins`. For datapacks, run `/datapack list`. 32 | validations: 33 | required: true 34 | 35 | - type: textarea 36 | attributes: 37 | label: Folia version 38 | description: | 39 | Run `/version` on your server and **paste** the full, unmodified output here. 40 | "latest" is *not* a version; we require the output of `/version` so we can adequately track down the issue. 41 | Additionally, do NOT provide a screenshot, you MUST paste the entire output. 42 |
43 | Example 44 | 45 | ``` 46 | > version 47 | [10:00:11 INFO]: Checking version, please wait... 48 | [10:00:12 INFO]: This server is running Folia version git-Folia-"5b74945" (MC: 1.19.4) (Implementing API version 1.19.4-R0.1-SNAPSHOT) (Git: 5b74945) 49 | You are running the latest version 50 | Previous version: git-Paper-481 (MC: 1.19.4) 51 | ``` 52 | 53 |
54 | validations: 55 | required: true 56 | 57 | - type: textarea 58 | attributes: 59 | label: Other 60 | description: | 61 | Please include other helpful information below. 62 | The more information we receive, the quicker and more effective we can be at finding the solution to the issue. 63 | validations: 64 | required: false 65 | 66 | - type: markdown 67 | attributes: 68 | value: | 69 | Before submitting this issue, please ensure the following: 70 | 71 | 1. You are running the latest version of Folia from [our downloads page](https://papermc.io/downloads). 72 | 2. You searched for and ensured there isn't already an open issue regarding this. 73 | 3. Your version of Minecraft is supported by Folia. 74 | 75 | If you think you have a bug but are not sure, feel free to ask the `#folia-help` channel of our 76 | [Discord](https://discord.gg/papermc). 77 | -------------------------------------------------------------------------------- /.github/ISSUE_TEMPLATE/config.yml: -------------------------------------------------------------------------------- 1 | blank_issues_enabled: false 2 | contact_links: 3 | - name: PaperMC Discord 4 | url: https://discord.gg/papermc 5 | about: If you are having minor issues, come ask us on our Discord server! 6 | - name: Exploit Report 7 | url: https://discord.gg/papermc 8 | about: | 9 | Due to GitHub not currently allowing private issues, exploit reports are currently handled via our Discord. 10 | To report an exploit, see the #paper-exploit-report channel. -------------------------------------------------------------------------------- /.github/ISSUE_TEMPLATE/feature-request.yml: -------------------------------------------------------------------------------- 1 | name: Feature Request 2 | description: Suggest an idea for Folia 3 | labels: [ "status: needs triage", "type: feature" ] 4 | body: 5 | - type: markdown 6 | attributes: 7 | value: | 8 | Thank you for filling out a feature request for Folia! Please be as detailed as possible so that we may consider and review the request easier. 9 | 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. 10 | 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 Folia. 11 | 12 | - type: textarea 13 | attributes: 14 | label: Is your feature request related to a problem? 15 | description: Please give some context for this request. Why do you want it added? 16 | validations: 17 | required: true 18 | 19 | - type: textarea 20 | attributes: 21 | label: Describe the solution you'd like. 22 | description: A clear and concise description of what you want. 23 | validations: 24 | required: true 25 | 26 | - type: textarea 27 | attributes: 28 | label: Describe alternatives you've considered. 29 | description: List any alternatives you might have tried to get the feature you want. 30 | validations: 31 | required: true 32 | 33 | - type: textarea 34 | attributes: 35 | label: Other 36 | description: Add any other context or screenshots about the feature request below. 37 | validations: 38 | required: false 39 | 40 | - type: markdown 41 | attributes: 42 | value: | 43 | Before submitting this feature request, please search our issue tracker to ensure your feature has not 44 | already been requested. -------------------------------------------------------------------------------- /.github/ISSUE_TEMPLATE/performance-problems.yml: -------------------------------------------------------------------------------- 1 | name: Performance Problem 2 | description: Report performance related problems or other areas of concern 3 | labels: [ "status: needs triage", "type: performance" ] 4 | body: 5 | - type: markdown 6 | attributes: 7 | value: | 8 | Before creating an issue regarding server performance, please consider reaching out for support in the 9 | `#folia-help` channel of [our Discord](https://discord.gg/papermc)! 10 | 11 | - type: input 12 | attributes: 13 | label: Profile link 14 | description: We ask that all profiles are a link, not a screenshot. Screenshots inhibit our ability to figure out the real cause of the issue. 15 | placeholder: "Example: https://spark.lucko.me/abcdefg12h" 16 | validations: 17 | required: true 18 | 19 | - type: textarea 20 | attributes: 21 | label: Description of issue 22 | description: If applicable, please describe your issue. 23 | validations: 24 | required: false 25 | 26 | - type: textarea 27 | attributes: 28 | label: Plugin and Datapack List 29 | description: | 30 | All plugins and datapacks running on your server. 31 | To list plugins, run `/plugins`. For datapacks, run `/datapack list`. 32 | validations: 33 | required: true 34 | 35 | - type: textarea 36 | attributes: 37 | label: Server config files 38 | description: We need bukkit.yml, spigot.yml, paper-global.yml, paper-world-defaults.yml and server.properties. If you use per-world Paper configs, make sure to include them. You can paste it below or use a paste site like https://paste.gg. 39 | value: | 40 | ``` 41 | Paste configs or paste.gg link here! 42 | ``` 43 | placeholder: Please don't remove the backticks; it makes your issue a lot harder to read! 44 | validations: 45 | required: true 46 | 47 | - type: textarea 48 | attributes: 49 | label: Folia version 50 | description: | 51 | Run `/version` on your server and **paste** the full, unmodified output here. 52 | "latest" is *not* a version; we require the output of `/version` so we can adequately track down the issue. 53 | Additionally, do NOT provide a screenshot, you MUST paste the entire output. 54 |
55 | Example 56 | 57 | ``` 58 | > version 59 | [10:00:11 INFO]: Checking version, please wait... 60 | [10:00:12 INFO]: This server is running Folia version git-Folia-"5b74945" (MC: 1.19.4) (Implementing API version 1.19.4-R0.1-SNAPSHOT) (Git: 5b74945) 61 | You are running the latest version 62 | Previous version: git-Paper-481 (MC: 1.19.4) 63 | ``` 64 | 65 |
66 | validations: 67 | required: true 68 | 69 | - type: textarea 70 | attributes: 71 | label: Other 72 | description: | 73 | Please include other helpful links below. 74 | The more information we receive, the quicker and more effective we can be at finding the solution to the issue. 75 | validations: 76 | required: false 77 | - type: markdown 78 | attributes: 79 | value: | 80 | Before submitting this issue, please ensure the following: 81 | 82 | 1. You are running the latest version of Folia from [our downloads page](https://papermc.io/downloads). 83 | 2. You searched for and ensured there isn't already an open issue regarding this. 84 | 3. Your version of Minecraft is supported by Folia. -------------------------------------------------------------------------------- /.github/ISSUE_TEMPLATE/server-crash-or-stacktrace.yml: -------------------------------------------------------------------------------- 1 | name: Server crash or Stacktrace 2 | description: Report server crashes or scary stacktraces 3 | labels: [ "status: needs triage" ] 4 | body: 5 | - type: textarea 6 | attributes: 7 | label: Stack trace 8 | description: | 9 | We need all of the stack trace! Do not cut off parts of it. Please do not use attachments. 10 | If you prefer, you can use a paste site like https://paste.gg. 11 | value: | 12 | ``` 13 | paste your stack trace or a paste.gg link here! 14 | ``` 15 | placeholder: Please don't remove the backticks; it makes your issue a lot harder to read! 16 | validations: 17 | required: true 18 | 19 | - type: textarea 20 | attributes: 21 | label: Plugin and Datapack List 22 | description: | 23 | All plugins and datapacks running on your server. 24 | To list plugins, run `/plugins`. For datapacks, run `/datapack list`. 25 | validations: 26 | required: true 27 | 28 | - type: textarea 29 | attributes: 30 | label: Actions to reproduce (if known) 31 | description: This may include a build schematic, a video, or detailed instructions to help reconstruct the issue. Anything helps! 32 | validations: 33 | required: false 34 | 35 | - type: textarea 36 | attributes: 37 | label: Folia version 38 | description: | 39 | Run `/version` on your server and **paste** the full, unmodified output here. 40 | "latest" is *not* a version; we require the output of `/version` so we can adequately track down the issue. 41 | Additionally, do NOT provide a screenshot, you MUST paste the entire output. 42 |
43 | Example 44 | 45 | ``` 46 | > version 47 | [10:00:11 INFO]: Checking version, please wait... 48 | [10:00:12 INFO]: This server is running Folia version git-Folia-"5b74945" (MC: 1.19.4) (Implementing API version 1.19.4-R0.1-SNAPSHOT) (Git: 5b74945) 49 | You are running the latest version 50 | Previous version: git-Paper-481 (MC: 1.19.4) 51 | ``` 52 | 53 |
54 | validations: 55 | required: true 56 | 57 | - type: textarea 58 | attributes: 59 | label: Other 60 | description: | 61 | Please include other helpful information below, if any. 62 | The more information we receive, the quicker and more effective we can be at finding the solution to the issue. 63 | validations: 64 | required: false 65 | 66 | - type: markdown 67 | attributes: 68 | value: | 69 | Before submitting this issue, please ensure the following: 70 | 71 | 1. You are running the latest version of Folia from [our downloads page](https://papermc.io/downloads). 72 | 2. Your version of Minecraft is supported by Folia. 73 | 74 | If your server crash log contains `DO NOT REPORT THIS TO FOLIA`, please ask in our 75 | [Discord](https://discord.gg/papermc) before opening this issue. These messages are informing you of server 76 | lag and providing debug information. -------------------------------------------------------------------------------- /.github/workflows/build.yml: -------------------------------------------------------------------------------- 1 | name: Patch and Build 2 | 3 | on: 4 | push: 5 | branches: [ "**" ] 6 | pull_request: 7 | 8 | jobs: 9 | build: 10 | # Only run on PRs if the source branch is on someone else's repo 11 | if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }} 12 | runs-on: ubuntu-latest 13 | steps: 14 | - name: Checkout Git Repository 15 | uses: actions/checkout@v4 16 | - name: Set up JDK 17 | uses: actions/setup-java@v4 18 | with: 19 | distribution: 'temurin' 20 | java-version: '21' 21 | - name: Setup Gradle 22 | uses: gradle/actions/setup-gradle@v4 23 | - name: Configure Git User Details 24 | run: git config --global user.email "actions@github.com" && git config --global user.name "Github Actions" 25 | - name: Apply Patches 26 | run: ./gradlew applyAllPatches --stacktrace 27 | - name: Build 28 | run: ./gradlew build 29 | -------------------------------------------------------------------------------- /.gitignore: -------------------------------------------------------------------------------- 1 | # Ignore Gradle project-specific cache directory 2 | .gradle 3 | 4 | # Ignore Gradle build output directory 5 | build 6 | 7 | /run 8 | 9 | /folia-server/build.gradle.kts 10 | /folia-server/src/minecraft 11 | /paper-server 12 | /folia-api/build.gradle.kts 13 | /paper-api 14 | /paper-api-generator 15 | 16 | .idea/ 17 | -------------------------------------------------------------------------------- /PATCHES-LICENSE: -------------------------------------------------------------------------------- 1 | GNU GENERAL PUBLIC LICENSE 2 | Version 3, 29 June 2007 3 | 4 | Copyright (C) 2007 Free Software Foundation, Inc. 5 | Everyone is permitted to copy and distribute verbatim copies 6 | of this license document, but changing it is not allowed. 7 | 8 | Preamble 9 | 10 | The GNU General Public License is a free, copyleft license for 11 | software and other kinds of works. 12 | 13 | The licenses for most software and other practical works are designed 14 | to take away your freedom to share and change the works. By contrast, 15 | the GNU General Public License is intended to guarantee your freedom to 16 | share and change all versions of a program--to make sure it remains free 17 | software for all its users. We, the Free Software Foundation, use the 18 | GNU General Public License for most of our software; it applies also to 19 | any other work released this way by its authors. You can apply it to 20 | your programs, too. 21 | 22 | When we speak of free software, we are referring to freedom, not 23 | price. Our General Public Licenses are designed to make sure that you 24 | have the freedom to distribute copies of free software (and charge for 25 | them if you wish), that you receive source code or can get it if you 26 | want it, that you can change the software or use pieces of it in new 27 | free programs, and that you know you can do these things. 28 | 29 | To protect your rights, we need to prevent others from denying you 30 | these rights or asking you to surrender the rights. Therefore, you have 31 | certain responsibilities if you distribute copies of the software, or if 32 | you modify it: responsibilities to respect the freedom of others. 33 | 34 | For example, if you distribute copies of such a program, whether 35 | gratis or for a fee, you must pass on to the recipients the same 36 | freedoms that you received. You must make sure that they, too, receive 37 | or can get the source code. And you must show them these terms so they 38 | know their rights. 39 | 40 | Developers that use the GNU GPL protect your rights with two steps: 41 | (1) assert copyright on the software, and (2) offer you this License 42 | giving you legal permission to copy, distribute and/or modify it. 43 | 44 | For the developers' and authors' protection, the GPL clearly explains 45 | that there is no warranty for this free software. For both users' and 46 | authors' sake, the GPL requires that modified versions be marked as 47 | changed, so that their problems will not be attributed erroneously to 48 | authors of previous versions. 49 | 50 | Some devices are designed to deny users access to install or run 51 | modified versions of the software inside them, although the manufacturer 52 | can do so. This is fundamentally incompatible with the aim of 53 | protecting users' freedom to change the software. The systematic 54 | pattern of such abuse occurs in the area of products for individuals to 55 | use, which is precisely where it is most unacceptable. Therefore, we 56 | have designed this version of the GPL to prohibit the practice for those 57 | products. If such problems arise substantially in other domains, we 58 | stand ready to extend this provision to those domains in future versions 59 | of the GPL, as needed to protect the freedom of users. 60 | 61 | Finally, every program is threatened constantly by software patents. 62 | States should not allow patents to restrict development and use of 63 | software on general-purpose computers, but in those that do, we wish to 64 | avoid the special danger that patents applied to a free program could 65 | make it effectively proprietary. To prevent this, the GPL assures that 66 | patents cannot be used to render the program non-free. 67 | 68 | The precise terms and conditions for copying, distribution and 69 | modification follow. 70 | 71 | TERMS AND CONDITIONS 72 | 73 | 0. Definitions. 74 | 75 | "This License" refers to version 3 of the GNU General Public License. 76 | 77 | "Copyright" also means copyright-like laws that apply to other kinds of 78 | works, such as semiconductor masks. 79 | 80 | "The Program" refers to any copyrightable work licensed under this 81 | License. Each licensee is addressed as "you". "Licensees" and 82 | "recipients" may be individuals or organizations. 83 | 84 | To "modify" a work means to copy from or adapt all or part of the work 85 | in a fashion requiring copyright permission, other than the making of an 86 | exact copy. The resulting work is called a "modified version" of the 87 | earlier work or a work "based on" the earlier work. 88 | 89 | A "covered work" means either the unmodified Program or a work based 90 | on the Program. 91 | 92 | To "propagate" a work means to do anything with it that, without 93 | permission, would make you directly or secondarily liable for 94 | infringement under applicable copyright law, except executing it on a 95 | computer or modifying a private copy. Propagation includes copying, 96 | distribution (with or without modification), making available to the 97 | public, and in some countries other activities as well. 98 | 99 | To "convey" a work means any kind of propagation that enables other 100 | parties to make or receive copies. Mere interaction with a user through 101 | a computer network, with no transfer of a copy, is not conveying. 102 | 103 | An interactive user interface displays "Appropriate Legal Notices" 104 | to the extent that it includes a convenient and prominently visible 105 | feature that (1) displays an appropriate copyright notice, and (2) 106 | tells the user that there is no warranty for the work (except to the 107 | extent that warranties are provided), that licensees may convey the 108 | work under this License, and how to view a copy of this License. If 109 | the interface presents a list of user commands or options, such as a 110 | menu, a prominent item in the list meets this criterion. 111 | 112 | 1. Source Code. 113 | 114 | The "source code" for a work means the preferred form of the work 115 | for making modifications to it. "Object code" means any non-source 116 | form of a work. 117 | 118 | A "Standard Interface" means an interface that either is an official 119 | standard defined by a recognized standards body, or, in the case of 120 | interfaces specified for a particular programming language, one that 121 | is widely used among developers working in that language. 122 | 123 | The "System Libraries" of an executable work include anything, other 124 | than the work as a whole, that (a) is included in the normal form of 125 | packaging a Major Component, but which is not part of that Major 126 | Component, and (b) serves only to enable use of the work with that 127 | Major Component, or to implement a Standard Interface for which an 128 | implementation is available to the public in source code form. A 129 | "Major Component", in this context, means a major essential component 130 | (kernel, window system, and so on) of the specific operating system 131 | (if any) on which the executable work runs, or a compiler used to 132 | produce the work, or an object code interpreter used to run it. 133 | 134 | The "Corresponding Source" for a work in object code form means all 135 | the source code needed to generate, install, and (for an executable 136 | work) run the object code and to modify the work, including scripts to 137 | control those activities. However, it does not include the work's 138 | System Libraries, or general-purpose tools or generally available free 139 | programs which are used unmodified in performing those activities but 140 | which are not part of the work. For example, Corresponding Source 141 | includes interface definition files associated with source files for 142 | the work, and the source code for shared libraries and dynamically 143 | linked subprograms that the work is specifically designed to require, 144 | such as by intimate data communication or control flow between those 145 | subprograms and other parts of the work. 146 | 147 | The Corresponding Source need not include anything that users 148 | can regenerate automatically from other parts of the Corresponding 149 | Source. 150 | 151 | The Corresponding Source for a work in source code form is that 152 | same work. 153 | 154 | 2. Basic Permissions. 155 | 156 | All rights granted under this License are granted for the term of 157 | copyright on the Program, and are irrevocable provided the stated 158 | conditions are met. This License explicitly affirms your unlimited 159 | permission to run the unmodified Program. The output from running a 160 | covered work is covered by this License only if the output, given its 161 | content, constitutes a covered work. This License acknowledges your 162 | rights of fair use or other equivalent, as provided by copyright law. 163 | 164 | You may make, run and propagate covered works that you do not 165 | convey, without conditions so long as your license otherwise remains 166 | in force. You may convey covered works to others for the sole purpose 167 | of having them make modifications exclusively for you, or provide you 168 | with facilities for running those works, provided that you comply with 169 | the terms of this License in conveying all material for which you do 170 | not control copyright. Those thus making or running the covered works 171 | for you must do so exclusively on your behalf, under your direction 172 | and control, on terms that prohibit them from making any copies of 173 | your copyrighted material outside their relationship with you. 174 | 175 | Conveying under any other circumstances is permitted solely under 176 | the conditions stated below. Sublicensing is not allowed; section 10 177 | makes it unnecessary. 178 | 179 | 3. Protecting Users' Legal Rights From Anti-Circumvention Law. 180 | 181 | No covered work shall be deemed part of an effective technological 182 | measure under any applicable law fulfilling obligations under article 183 | 11 of the WIPO copyright treaty adopted on 20 December 1996, or 184 | similar laws prohibiting or restricting circumvention of such 185 | measures. 186 | 187 | When you convey a covered work, you waive any legal power to forbid 188 | circumvention of technological measures to the extent such circumvention 189 | is effected by exercising rights under this License with respect to 190 | the covered work, and you disclaim any intention to limit operation or 191 | modification of the work as a means of enforcing, against the work's 192 | users, your or third parties' legal rights to forbid circumvention of 193 | technological measures. 194 | 195 | 4. Conveying Verbatim Copies. 196 | 197 | You may convey verbatim copies of the Program's source code as you 198 | receive it, in any medium, provided that you conspicuously and 199 | appropriately publish on each copy an appropriate copyright notice; 200 | keep intact all notices stating that this License and any 201 | non-permissive terms added in accord with section 7 apply to the code; 202 | keep intact all notices of the absence of any warranty; and give all 203 | recipients a copy of this License along with the Program. 204 | 205 | You may charge any price or no price for each copy that you convey, 206 | and you may offer support or warranty protection for a fee. 207 | 208 | 5. Conveying Modified Source Versions. 209 | 210 | You may convey a work based on the Program, or the modifications to 211 | produce it from the Program, in the form of source code under the 212 | terms of section 4, provided that you also meet all of these conditions: 213 | 214 | a) The work must carry prominent notices stating that you modified 215 | it, and giving a relevant date. 216 | 217 | b) The work must carry prominent notices stating that it is 218 | released under this License and any conditions added under section 219 | 7. This requirement modifies the requirement in section 4 to 220 | "keep intact all notices". 221 | 222 | c) You must license the entire work, as a whole, under this 223 | License to anyone who comes into possession of a copy. This 224 | License will therefore apply, along with any applicable section 7 225 | additional terms, to the whole of the work, and all its parts, 226 | regardless of how they are packaged. This License gives no 227 | permission to license the work in any other way, but it does not 228 | invalidate such permission if you have separately received it. 229 | 230 | d) If the work has interactive user interfaces, each must display 231 | Appropriate Legal Notices; however, if the Program has interactive 232 | interfaces that do not display Appropriate Legal Notices, your 233 | work need not make them do so. 234 | 235 | A compilation of a covered work with other separate and independent 236 | works, which are not by their nature extensions of the covered work, 237 | and which are not combined with it such as to form a larger program, 238 | in or on a volume of a storage or distribution medium, is called an 239 | "aggregate" if the compilation and its resulting copyright are not 240 | used to limit the access or legal rights of the compilation's users 241 | beyond what the individual works permit. Inclusion of a covered work 242 | in an aggregate does not cause this License to apply to the other 243 | parts of the aggregate. 244 | 245 | 6. Conveying Non-Source Forms. 246 | 247 | You may convey a covered work in object code form under the terms 248 | of sections 4 and 5, provided that you also convey the 249 | machine-readable Corresponding Source under the terms of this License, 250 | in one of these ways: 251 | 252 | a) Convey the object code in, or embodied in, a physical product 253 | (including a physical distribution medium), accompanied by the 254 | Corresponding Source fixed on a durable physical medium 255 | customarily used for software interchange. 256 | 257 | b) Convey the object code in, or embodied in, a physical product 258 | (including a physical distribution medium), accompanied by a 259 | written offer, valid for at least three years and valid for as 260 | long as you offer spare parts or customer support for that product 261 | model, to give anyone who possesses the object code either (1) a 262 | copy of the Corresponding Source for all the software in the 263 | product that is covered by this License, on a durable physical 264 | medium customarily used for software interchange, for a price no 265 | more than your reasonable cost of physically performing this 266 | conveying of source, or (2) access to copy the 267 | Corresponding Source from a network server at no charge. 268 | 269 | c) Convey individual copies of the object code with a copy of the 270 | written offer to provide the Corresponding Source. This 271 | alternative is allowed only occasionally and noncommercially, and 272 | only if you received the object code with such an offer, in accord 273 | with subsection 6b. 274 | 275 | d) Convey the object code by offering access from a designated 276 | place (gratis or for a charge), and offer equivalent access to the 277 | Corresponding Source in the same way through the same place at no 278 | further charge. You need not require recipients to copy the 279 | Corresponding Source along with the object code. If the place to 280 | copy the object code is a network server, the Corresponding Source 281 | may be on a different server (operated by you or a third party) 282 | that supports equivalent copying facilities, provided you maintain 283 | clear directions next to the object code saying where to find the 284 | Corresponding Source. Regardless of what server hosts the 285 | Corresponding Source, you remain obligated to ensure that it is 286 | available for as long as needed to satisfy these requirements. 287 | 288 | e) Convey the object code using peer-to-peer transmission, provided 289 | you inform other peers where the object code and Corresponding 290 | Source of the work are being offered to the general public at no 291 | charge under subsection 6d. 292 | 293 | A separable portion of the object code, whose source code is excluded 294 | from the Corresponding Source as a System Library, need not be 295 | included in conveying the object code work. 296 | 297 | A "User Product" is either (1) a "consumer product", which means any 298 | tangible personal property which is normally used for personal, family, 299 | or household purposes, or (2) anything designed or sold for incorporation 300 | into a dwelling. In determining whether a product is a consumer product, 301 | doubtful cases shall be resolved in favor of coverage. For a particular 302 | product received by a particular user, "normally used" refers to a 303 | typical or common use of that class of product, regardless of the status 304 | of the particular user or of the way in which the particular user 305 | actually uses, or expects or is expected to use, the product. A product 306 | is a consumer product regardless of whether the product has substantial 307 | commercial, industrial or non-consumer uses, unless such uses represent 308 | the only significant mode of use of the product. 309 | 310 | "Installation Information" for a User Product means any methods, 311 | procedures, authorization keys, or other information required to install 312 | and execute modified versions of a covered work in that User Product from 313 | a modified version of its Corresponding Source. The information must 314 | suffice to ensure that the continued functioning of the modified object 315 | code is in no case prevented or interfered with solely because 316 | modification has been made. 317 | 318 | If you convey an object code work under this section in, or with, or 319 | specifically for use in, a User Product, and the conveying occurs as 320 | part of a transaction in which the right of possession and use of the 321 | User Product is transferred to the recipient in perpetuity or for a 322 | fixed term (regardless of how the transaction is characterized), the 323 | Corresponding Source conveyed under this section must be accompanied 324 | by the Installation Information. But this requirement does not apply 325 | if neither you nor any third party retains the ability to install 326 | modified object code on the User Product (for example, the work has 327 | been installed in ROM). 328 | 329 | The requirement to provide Installation Information does not include a 330 | requirement to continue to provide support service, warranty, or updates 331 | for a work that has been modified or installed by the recipient, or for 332 | the User Product in which it has been modified or installed. Access to a 333 | network may be denied when the modification itself materially and 334 | adversely affects the operation of the network or violates the rules and 335 | protocols for communication across the network. 336 | 337 | Corresponding Source conveyed, and Installation Information provided, 338 | in accord with this section must be in a format that is publicly 339 | documented (and with an implementation available to the public in 340 | source code form), and must require no special password or key for 341 | unpacking, reading or copying. 342 | 343 | 7. Additional Terms. 344 | 345 | "Additional permissions" are terms that supplement the terms of this 346 | License by making exceptions from one or more of its conditions. 347 | Additional permissions that are applicable to the entire Program shall 348 | be treated as though they were included in this License, to the extent 349 | that they are valid under applicable law. If additional permissions 350 | apply only to part of the Program, that part may be used separately 351 | under those permissions, but the entire Program remains governed by 352 | this License without regard to the additional permissions. 353 | 354 | When you convey a copy of a covered work, you may at your option 355 | remove any additional permissions from that copy, or from any part of 356 | it. (Additional permissions may be written to require their own 357 | removal in certain cases when you modify the work.) You may place 358 | additional permissions on material, added by you to a covered work, 359 | for which you have or can give appropriate copyright permission. 360 | 361 | Notwithstanding any other provision of this License, for material you 362 | add to a covered work, you may (if authorized by the copyright holders of 363 | that material) supplement the terms of this License with terms: 364 | 365 | a) Disclaiming warranty or limiting liability differently from the 366 | terms of sections 15 and 16 of this License; or 367 | 368 | b) Requiring preservation of specified reasonable legal notices or 369 | author attributions in that material or in the Appropriate Legal 370 | Notices displayed by works containing it; or 371 | 372 | c) Prohibiting misrepresentation of the origin of that material, or 373 | requiring that modified versions of such material be marked in 374 | reasonable ways as different from the original version; or 375 | 376 | d) Limiting the use for publicity purposes of names of licensors or 377 | authors of the material; or 378 | 379 | e) Declining to grant rights under trademark law for use of some 380 | trade names, trademarks, or service marks; or 381 | 382 | f) Requiring indemnification of licensors and authors of that 383 | material by anyone who conveys the material (or modified versions of 384 | it) with contractual assumptions of liability to the recipient, for 385 | any liability that these contractual assumptions directly impose on 386 | those licensors and authors. 387 | 388 | All other non-permissive additional terms are considered "further 389 | restrictions" within the meaning of section 10. If the Program as you 390 | received it, or any part of it, contains a notice stating that it is 391 | governed by this License along with a term that is a further 392 | restriction, you may remove that term. If a license document contains 393 | a further restriction but permits relicensing or conveying under this 394 | License, you may add to a covered work material governed by the terms 395 | of that license document, provided that the further restriction does 396 | not survive such relicensing or conveying. 397 | 398 | If you add terms to a covered work in accord with this section, you 399 | must place, in the relevant source files, a statement of the 400 | additional terms that apply to those files, or a notice indicating 401 | where to find the applicable terms. 402 | 403 | Additional terms, permissive or non-permissive, may be stated in the 404 | form of a separately written license, or stated as exceptions; 405 | the above requirements apply either way. 406 | 407 | 8. Termination. 408 | 409 | You may not propagate or modify a covered work except as expressly 410 | provided under this License. Any attempt otherwise to propagate or 411 | modify it is void, and will automatically terminate your rights under 412 | this License (including any patent licenses granted under the third 413 | paragraph of section 11). 414 | 415 | However, if you cease all violation of this License, then your 416 | license from a particular copyright holder is reinstated (a) 417 | provisionally, unless and until the copyright holder explicitly and 418 | finally terminates your license, and (b) permanently, if the copyright 419 | holder fails to notify you of the violation by some reasonable means 420 | prior to 60 days after the cessation. 421 | 422 | Moreover, your license from a particular copyright holder is 423 | reinstated permanently if the copyright holder notifies you of the 424 | violation by some reasonable means, this is the first time you have 425 | received notice of violation of this License (for any work) from that 426 | copyright holder, and you cure the violation prior to 30 days after 427 | your receipt of the notice. 428 | 429 | Termination of your rights under this section does not terminate the 430 | licenses of parties who have received copies or rights from you under 431 | this License. If your rights have been terminated and not permanently 432 | reinstated, you do not qualify to receive new licenses for the same 433 | material under section 10. 434 | 435 | 9. Acceptance Not Required for Having Copies. 436 | 437 | You are not required to accept this License in order to receive or 438 | run a copy of the Program. Ancillary propagation of a covered work 439 | occurring solely as a consequence of using peer-to-peer transmission 440 | to receive a copy likewise does not require acceptance. However, 441 | nothing other than this License grants you permission to propagate or 442 | modify any covered work. These actions infringe copyright if you do 443 | not accept this License. Therefore, by modifying or propagating a 444 | covered work, you indicate your acceptance of this License to do so. 445 | 446 | 10. Automatic Licensing of Downstream Recipients. 447 | 448 | Each time you convey a covered work, the recipient automatically 449 | receives a license from the original licensors, to run, modify and 450 | propagate that work, subject to this License. You are not responsible 451 | for enforcing compliance by third parties with this License. 452 | 453 | An "entity transaction" is a transaction transferring control of an 454 | organization, or substantially all assets of one, or subdividing an 455 | organization, or merging organizations. If propagation of a covered 456 | work results from an entity transaction, each party to that 457 | transaction who receives a copy of the work also receives whatever 458 | licenses to the work the party's predecessor in interest had or could 459 | give under the previous paragraph, plus a right to possession of the 460 | Corresponding Source of the work from the predecessor in interest, if 461 | the predecessor has it or can get it with reasonable efforts. 462 | 463 | You may not impose any further restrictions on the exercise of the 464 | rights granted or affirmed under this License. For example, you may 465 | not impose a license fee, royalty, or other charge for exercise of 466 | rights granted under this License, and you may not initiate litigation 467 | (including a cross-claim or counterclaim in a lawsuit) alleging that 468 | any patent claim is infringed by making, using, selling, offering for 469 | sale, or importing the Program or any portion of it. 470 | 471 | 11. Patents. 472 | 473 | A "contributor" is a copyright holder who authorizes use under this 474 | License of the Program or a work on which the Program is based. The 475 | work thus licensed is called the contributor's "contributor version". 476 | 477 | A contributor's "essential patent claims" are all patent claims 478 | owned or controlled by the contributor, whether already acquired or 479 | hereafter acquired, that would be infringed by some manner, permitted 480 | by this License, of making, using, or selling its contributor version, 481 | but do not include claims that would be infringed only as a 482 | consequence of further modification of the contributor version. For 483 | purposes of this definition, "control" includes the right to grant 484 | patent sublicenses in a manner consistent with the requirements of 485 | this License. 486 | 487 | Each contributor grants you a non-exclusive, worldwide, royalty-free 488 | patent license under the contributor's essential patent claims, to 489 | make, use, sell, offer for sale, import and otherwise run, modify and 490 | propagate the contents of its contributor version. 491 | 492 | In the following three paragraphs, a "patent license" is any express 493 | agreement or commitment, however denominated, not to enforce a patent 494 | (such as an express permission to practice a patent or covenant not to 495 | sue for patent infringement). To "grant" such a patent license to a 496 | party means to make such an agreement or commitment not to enforce a 497 | patent against the party. 498 | 499 | If you convey a covered work, knowingly relying on a patent license, 500 | and the Corresponding Source of the work is not available for anyone 501 | to copy, free of charge and under the terms of this License, through a 502 | publicly available network server or other readily accessible means, 503 | then you must either (1) cause the Corresponding Source to be so 504 | available, or (2) arrange to deprive yourself of the benefit of the 505 | patent license for this particular work, or (3) arrange, in a manner 506 | consistent with the requirements of this License, to extend the patent 507 | license to downstream recipients. "Knowingly relying" means you have 508 | actual knowledge that, but for the patent license, your conveying the 509 | covered work in a country, or your recipient's use of the covered work 510 | in a country, would infringe one or more identifiable patents in that 511 | country that you have reason to believe are valid. 512 | 513 | If, pursuant to or in connection with a single transaction or 514 | arrangement, you convey, or propagate by procuring conveyance of, a 515 | covered work, and grant a patent license to some of the parties 516 | receiving the covered work authorizing them to use, propagate, modify 517 | or convey a specific copy of the covered work, then the patent license 518 | you grant is automatically extended to all recipients of the covered 519 | work and works based on it. 520 | 521 | A patent license is "discriminatory" if it does not include within 522 | the scope of its coverage, prohibits the exercise of, or is 523 | conditioned on the non-exercise of one or more of the rights that are 524 | specifically granted under this License. You may not convey a covered 525 | work if you are a party to an arrangement with a third party that is 526 | in the business of distributing software, under which you make payment 527 | to the third party based on the extent of your activity of conveying 528 | the work, and under which the third party grants, to any of the 529 | parties who would receive the covered work from you, a discriminatory 530 | patent license (a) in connection with copies of the covered work 531 | conveyed by you (or copies made from those copies), or (b) primarily 532 | for and in connection with specific products or compilations that 533 | contain the covered work, unless you entered into that arrangement, 534 | or that patent license was granted, prior to 28 March 2007. 535 | 536 | Nothing in this License shall be construed as excluding or limiting 537 | any implied license or other defenses to infringement that may 538 | otherwise be available to you under applicable patent law. 539 | 540 | 12. No Surrender of Others' Freedom. 541 | 542 | If conditions are imposed on you (whether by court order, agreement or 543 | otherwise) that contradict the conditions of this License, they do not 544 | excuse you from the conditions of this License. If you cannot convey a 545 | covered work so as to satisfy simultaneously your obligations under this 546 | License and any other pertinent obligations, then as a consequence you may 547 | not convey it at all. For example, if you agree to terms that obligate you 548 | to collect a royalty for further conveying from those to whom you convey 549 | the Program, the only way you could satisfy both those terms and this 550 | License would be to refrain entirely from conveying the Program. 551 | 552 | 13. Use with the GNU Affero General Public License. 553 | 554 | Notwithstanding any other provision of this License, you have 555 | permission to link or combine any covered work with a work licensed 556 | under version 3 of the GNU Affero General Public License into a single 557 | combined work, and to convey the resulting work. The terms of this 558 | License will continue to apply to the part which is the covered work, 559 | but the special requirements of the GNU Affero General Public License, 560 | section 13, concerning interaction through a network will apply to the 561 | combination as such. 562 | 563 | 14. Revised Versions of this License. 564 | 565 | The Free Software Foundation may publish revised and/or new versions of 566 | the GNU General Public License from time to time. Such new versions will 567 | be similar in spirit to the present version, but may differ in detail to 568 | address new problems or concerns. 569 | 570 | Each version is given a distinguishing version number. If the 571 | Program specifies that a certain numbered version of the GNU General 572 | Public License "or any later version" applies to it, you have the 573 | option of following the terms and conditions either of that numbered 574 | version or of any later version published by the Free Software 575 | Foundation. If the Program does not specify a version number of the 576 | GNU General Public License, you may choose any version ever published 577 | by the Free Software Foundation. 578 | 579 | If the Program specifies that a proxy can decide which future 580 | versions of the GNU General Public License can be used, that proxy's 581 | public statement of acceptance of a version permanently authorizes you 582 | to choose that version for the Program. 583 | 584 | Later license versions may give you additional or different 585 | permissions. However, no additional obligations are imposed on any 586 | author or copyright holder as a result of your choosing to follow a 587 | later version. 588 | 589 | 15. Disclaimer of Warranty. 590 | 591 | THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY 592 | APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT 593 | HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY 594 | OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, 595 | THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 596 | PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM 597 | IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF 598 | ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 599 | 600 | 16. Limitation of Liability. 601 | 602 | IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING 603 | WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS 604 | THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY 605 | GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE 606 | USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF 607 | DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD 608 | PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), 609 | EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF 610 | SUCH DAMAGES. 611 | 612 | 17. Interpretation of Sections 15 and 16. 613 | 614 | If the disclaimer of warranty and limitation of liability provided 615 | above cannot be given local legal effect according to their terms, 616 | reviewing courts shall apply local law that most closely approximates 617 | an absolute waiver of all civil liability in connection with the 618 | Program, unless a warranty or assumption of liability accompanies a 619 | copy of the Program in return for a fee. 620 | 621 | END OF TERMS AND CONDITIONS 622 | 623 | How to Apply These Terms to Your New Programs 624 | 625 | If you develop a new program, and you want it to be of the greatest 626 | possible use to the public, the best way to achieve this is to make it 627 | free software which everyone can redistribute and change under these terms. 628 | 629 | To do so, attach the following notices to the program. It is safest 630 | to attach them to the start of each source file to most effectively 631 | state the exclusion of warranty; and each file should have at least 632 | the "copyright" line and a pointer to where the full notice is found. 633 | 634 | 635 | Copyright (C) 636 | 637 | This program is free software: you can redistribute it and/or modify 638 | it under the terms of the GNU General Public License as published by 639 | the Free Software Foundation, either version 3 of the License, or 640 | (at your option) any later version. 641 | 642 | This program is distributed in the hope that it will be useful, 643 | but WITHOUT ANY WARRANTY; without even the implied warranty of 644 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 645 | GNU General Public License for more details. 646 | 647 | You should have received a copy of the GNU General Public License 648 | along with this program. If not, see . 649 | 650 | Also add information on how to contact you by electronic and paper mail. 651 | 652 | If the program does terminal interaction, make it output a short 653 | notice like this when it starts in an interactive mode: 654 | 655 | Copyright (C) 656 | This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. 657 | This is free software, and you are welcome to redistribute it 658 | under certain conditions; type `show c' for details. 659 | 660 | The hypothetical commands `show w' and `show c' should show the appropriate 661 | parts of the General Public License. Of course, your program's commands 662 | might be different; for a GUI interface, you would use an "about box". 663 | 664 | You should also get your employer (if you work as a programmer) or school, 665 | if any, to sign a "copyright disclaimer" for the program, if necessary. 666 | For more information on this, and how to apply and follow the GNU GPL, see 667 | . 668 | 669 | The GNU General Public License does not permit incorporating your program 670 | into proprietary programs. If your program is a subroutine library, you 671 | may consider it more useful to permit linking proprietary applications with 672 | the library. If this is what you want to do, use the GNU Lesser General 673 | Public License instead of this License. But first, please read 674 | . 675 | -------------------------------------------------------------------------------- /PROJECT_DESCRIPTION.md: -------------------------------------------------------------------------------- 1 | # Project overview 2 | 3 | This page has been moved to [the PaperMC documentation](https://docs.papermc.io/folia/reference/overview) site. 4 | -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- 1 |
2 | 3 |

4 |

Fork of Paper which adds regionised multithreading to the dedicated server.

5 |
6 | 7 | ## Overview 8 | 9 | Folia groups nearby loaded chunks to form an "independent region." 10 | See [the PaperMC documentation](https://docs.papermc.io/folia/reference/region-logic) for exact details on how Folia 11 | will group nearby chunks. 12 | Each independent region has its own tick loop, which is ticked at the 13 | regular Minecraft tickrate (20TPS). The tick loops are executed 14 | on a thread pool in parallel. There is no main thread anymore, 15 | as each region effectively has its own "main thread" that executes 16 | the entire tick loop. 17 | 18 | For a server with many spread out players, Folia will create many 19 | spread out regions and tick them all in parallel on a configurable sized 20 | threadpool. Thus, Folia should scale well for servers like this. 21 | 22 | Folia is also its own project, this will not be merged into Paper 23 | for the foreseeable future. 24 | 25 | A more detailed but abstract overview: [Project overview](https://docs.papermc.io/folia/reference/overview). 26 | 27 | ## FAQ 28 | 29 | ### What server types can benefit from Folia? 30 | Server types that naturally spread players out, 31 | like skyblock or SMP, will benefit the most from Folia. The server 32 | should have a sizeable player count, too. 33 | 34 | ### What hardware will Folia run best on? 35 | Ideally, at least 16 _cores_ (not threads). 36 | 37 | ### How to best configure Folia? 38 | First, it is recommended that the world is pre-generated so that the number 39 | of chunk system worker threads required is reduced greatly. 40 | 41 | The following is a _very rough_ estimation based off of the testing 42 | done before Folia was released on the test server we ran that 43 | had ~330 players peak. So, it is not exact and will require further tuning - 44 | just take it as a starting point. 45 | 46 | The total number of cores on the machine available should be 47 | taken into account. Then, allocate threads for: 48 | - netty IO :~4 per 200-300 players 49 | - chunk system io threads: ~3 per 200-300 players 50 | - chunk system workers if pre-generated, ~2 per 200-300 players 51 | - There is no best guess for chunk system workers if not pre-generated, as 52 | on the test server we ran we gave 16 threads but chunk generation was still 53 | slow at ~300 players. 54 | - GC Settings: ???? But, GC settings _do_ allocate concurrent threads, and you need 55 | to know exactly how many. This is typically through the `-XX:ConcGCThreads=n` flag. Do not 56 | confuse this flag with `-XX:ParallelGCThreads=n`, as parallel GC threads only run when 57 | the application is paused by GC and as such should not be taken into account. 58 | 59 | After all of that allocation, the remaining cores on the system until 80% 60 | allocation (total threads allocated < 80% of cpus available) can be 61 | allocated to tickthreads (under global config, threaded-regions.threads). 62 | 63 | The reason you should not allocate more than 80% of the cores is due to the 64 | fact that plugins or even the server may make use of additional threads 65 | that you cannot configure or even predict. 66 | 67 | Additionally, the above is all a rough guess based on player count, but 68 | it is very likely that the thread allocation will not be ideal, and you 69 | will need to tune it based on usage of the threads that you end up seeing. 70 | 71 | ## Plugin compatibility 72 | 73 | There is no more main thread. I expect _every_ single plugin 74 | that exists to require _some_ level of modification to function 75 | in Folia. Additionally, multithreading of _any kind_ introduces 76 | possible race conditions in plugin held data - so, there are bound 77 | to be changes that need to be made. 78 | 79 | So, have your expectations for compatibility at 0. 80 | 81 | ## API plans 82 | 83 | Currently, there is a lot of API that relies on the main thread. 84 | I expect basically zero plugins that are compatible with Paper to 85 | be compatible with Folia. However, there are plans to add API that 86 | would allow Folia plugins to be compatible with Paper. 87 | 88 | For example, the Bukkit Scheduler. The Bukkit Scheduler inherently 89 | relies on a single main thread. Folia's RegionScheduler and Folia's 90 | EntityScheduler allow scheduling of tasks to the "next tick" of whatever 91 | region "owns" either a location or an entity. These could be implemented 92 | on regular Paper, except they schedule to the main thread - in both cases, 93 | the execution of the task will occur on the thread that "owns" the 94 | location or entity. This concept applies in general, as the current Paper 95 | (single threaded) can be viewed as one giant "region" that encompasses 96 | all chunks in all worlds. 97 | 98 | It is not yet decided whether to add this API to Paper itself directly 99 | or to Paperlib. 100 | 101 | ### The new rules 102 | 103 | First, Folia breaks many plugins. To aid users in figuring out which 104 | plugins work, only plugins that have been explicitly marked by the 105 | author(s) to work with Folia will be loaded. By placing 106 | "folia-supported: true" into the plugin's plugin.yml, plugin authors 107 | can mark their plugin as compatible with regionised multithreading. 108 | 109 | The other important rule is that the regions tick in _parallel_, and not 110 | _concurrently_. They do not share data, they do not expect to share data, 111 | and sharing of data _will_ cause data corruption. 112 | Code that is running in one region under no circumstance can 113 | be accessing or modifying data that is in another region. Just 114 | because multithreading is in the name, it doesn't mean that everything 115 | is now thread-safe. In fact, there are only a _few_ things that were 116 | made thread-safe to make this happen. As time goes on, the number 117 | of thread context checks will only grow, even _if_ it comes at a 118 | performance penalty - _nobody_ is going to use or develop for a 119 | server platform that is buggy as hell, and the only way to 120 | prevent and find these bugs is to make bad accesses fail _hard_ at the 121 | source of the bad access. 122 | 123 | This means that Folia compatible plugins need to take advantage of 124 | API like the RegionScheduler and the EntityScheduler to ensure 125 | their code is running on the correct thread context. 126 | 127 | In general, it is safe to assume that a region owns chunk data 128 | in an approximate 8 chunks from the source of an event (i.e. player 129 | breaks block, can probably access 8 chunks around that block). But, 130 | this is not guaranteed - plugins should take advantage of upcoming 131 | thread-check API to ensure correct behavior. 132 | 133 | The only guarantee of thread-safety comes from the fact that a 134 | single region owns data in certain chunks - and if that region is 135 | ticking, then it has full access to that data. This data is 136 | specifically entity/chunk/poi data, and is entirely unrelated 137 | to **ANY** plugin data. 138 | 139 | Normal multithreading rules apply to data that plugins store/access 140 | their own data or another plugin's - events/commands/etc. are called 141 | in _parallel_ because regions are ticking in _parallel_ (we CANNOT 142 | call them in a synchronous fashion, as this opens up deadlock issues 143 | and would handicap performance). There are no easy ways out of this, 144 | it depends solely on what data is being accessed. Sometimes a 145 | concurrent collection (like ConcurrentHashMap) is enough, and often a 146 | concurrent collection used carelessly will only _hide_ threading 147 | issues, which then become near impossible to debug. 148 | 149 | ### Current API additions 150 | 151 | To properly understand API additions, please read 152 | [Project overview](https://docs.papermc.io/folia/reference/overview). 153 | 154 | - RegionScheduler, AsyncScheduler, GlobalRegionScheduler, and EntityScheduler 155 | acting as a replacement for the BukkitScheduler. 156 | The entity scheduler is retrieved via Entity#getScheduler, and the 157 | rest of the schedulers can be retrieved from the Bukkit/Server classes. 158 | - Bukkit#isOwnedByCurrentRegion to test if the current ticking region 159 | owns positions/entities 160 | 161 | ### Thread contexts for API 162 | 163 | To properly understand API additions, please read 164 | [Project overview](https://docs.papermc.io/folia/reference/overview). 165 | 166 | General rules of thumb: 167 | 168 | 1. Commands for entities/players are called on the region which owns 169 | the entity/player. Console commands are executed on the global region. 170 | 171 | 2. Events involving a single entity (i.e player breaks/places block) are 172 | called on the region owning entity. Events involving actions on an entity 173 | (such as entity damage) are invoked on the region owning the target entity. 174 | 175 | 3. The async modifier for events is deprecated - all events 176 | fired from regions or the global region are considered _synchronous_, 177 | even though there is no main thread anymore. 178 | 179 | ### Current broken API 180 | 181 | - Most API that interacts with portals / respawning players / some 182 | player login API is broken. 183 | - ALL scoreboard API is considered broken (this is global state that 184 | I've not figured out how to properly implement yet) 185 | - World loading/unloading 186 | - Entity#teleport. This will NEVER UNDER ANY CIRCUMSTANCE come back, 187 | use teleportAsync 188 | - Could be more 189 | 190 | ### Planned API additions 191 | 192 | - Proper asynchronous events. This would allow the result of an event 193 | to be completed later, on a different thread context. This is required 194 | to implement some things like spawn position select, as asynchronous 195 | chunk loads are required when accessing chunk data out-of-region. 196 | - World loading/unloading 197 | - More to come here 198 | 199 | ### Planned API changes 200 | 201 | - Super aggressive thread checks across the board. This is absolutely 202 | required to prevent plugin devs from shipping code that may randomly 203 | break random parts of the server in entirely _undiagnosable_ manners. 204 | - More to come here 205 | 206 | ### Maven information 207 | * Maven Repo (for folia-api): 208 | ```xml 209 | 210 | papermc 211 | https://repo.papermc.io/repository/maven-public/ 212 | 213 | ``` 214 | * Artifact Information: 215 | ```xml 216 | 217 | dev.folia 218 | folia-api 219 | 1.20.1-R0.1-SNAPSHOT 220 | provided 221 | 222 | ``` 223 | 224 | 225 | ## License 226 | The PATCHES-LICENSE file describes the license for api & server patches, 227 | found in `./patches` and its subdirectories except when noted otherwise. 228 | 229 | The fork is based off of PaperMC's fork example found [here](https://github.com/PaperMC/paperweight-examples). 230 | As such, it contains modifications to it in this project, please see the repository for license information 231 | of modified files. 232 | -------------------------------------------------------------------------------- /REGION_LOGIC.md: -------------------------------------------------------------------------------- 1 | # Region Logic 2 | 3 | This page has been moved to [the PaperMC documentation](https://docs.papermc.io/folia/reference/region-logic) site. 4 | -------------------------------------------------------------------------------- /build-data/dev-imports.txt: -------------------------------------------------------------------------------- 1 | # You can use this file to import files from minecraft libraries into the project 2 | # format: 3 | # 4 | # both fully qualified and a file based syntax are accepted for : 5 | # authlib com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java 6 | # datafixerupper com.mojang.datafixers.DataFixerBuilder 7 | # datafixerupper com/mojang/datafixers/util/Either.java 8 | # To import classes from the vanilla Minecraft jar use `minecraft` as the artifactId: 9 | # minecraft net.minecraft.world.level.entity.LevelEntityGetterAdapter 10 | # minecraft net/minecraft/world/level/entity/LevelEntityGetter.java 11 | # To import minecraft data files, like the default chat type, use `mc_data` as the prefix: 12 | # mc_data chat_type/chat.json 13 | # mc_data dimension_type/overworld.json 14 | # 15 | -------------------------------------------------------------------------------- /build-data/fork.at: -------------------------------------------------------------------------------- 1 | # This file is auto generated, any changes may be overridden! 2 | # See CONTRIBUTING.md on how to add access transformers. 3 | public net.minecraft.data.registries.TradeRebalanceRegistries BUILDER 4 | -------------------------------------------------------------------------------- /build.gradle.kts: -------------------------------------------------------------------------------- 1 | import org.gradle.api.tasks.testing.logging.TestExceptionFormat 2 | import org.gradle.api.tasks.testing.logging.TestLogEvent 3 | import io.papermc.paperweight.tasks.RebuildGitPatches 4 | 5 | plugins { 6 | java // TODO java launcher tasks 7 | id("io.papermc.paperweight.patcher") version "2.0.0-beta.17" 8 | } 9 | 10 | paperweight { 11 | upstreams.paper { 12 | ref = providers.gradleProperty("paperRef") 13 | 14 | patchFile { 15 | path = "paper-server/build.gradle.kts" 16 | outputFile = file("folia-server/build.gradle.kts") 17 | patchFile = file("folia-server/build.gradle.kts.patch") 18 | } 19 | patchFile { 20 | path = "paper-api/build.gradle.kts" 21 | outputFile = file("folia-api/build.gradle.kts") 22 | patchFile = file("folia-api/build.gradle.kts.patch") 23 | } 24 | patchDir("paperApi") { 25 | upstreamPath = "paper-api" 26 | excludes = setOf("build.gradle.kts") 27 | patchesDir = file("folia-api/paper-patches") 28 | outputDir = file("paper-api") 29 | } 30 | } 31 | } 32 | 33 | val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/" 34 | 35 | subprojects { 36 | apply(plugin = "java-library") 37 | apply(plugin = "maven-publish") 38 | 39 | extensions.configure { 40 | toolchain { 41 | languageVersion = JavaLanguageVersion.of(21) 42 | } 43 | } 44 | 45 | repositories { 46 | mavenCentral() 47 | maven(paperMavenPublicUrl) 48 | } 49 | 50 | dependencies { 51 | "testRuntimeOnly"("org.junit.platform:junit-platform-launcher") 52 | } 53 | 54 | tasks.withType().configureEach { 55 | isPreserveFileTimestamps = false 56 | isReproducibleFileOrder = true 57 | } 58 | tasks.withType { 59 | options.encoding = Charsets.UTF_8.name() 60 | options.release = 21 61 | options.isFork = true 62 | } 63 | tasks.withType { 64 | options.encoding = Charsets.UTF_8.name() 65 | } 66 | tasks.withType { 67 | filteringCharset = Charsets.UTF_8.name() 68 | } 69 | tasks.withType { 70 | testLogging { 71 | showStackTraces = true 72 | exceptionFormat = TestExceptionFormat.FULL 73 | events(TestLogEvent.STANDARD_OUT) 74 | } 75 | } 76 | 77 | extensions.configure { 78 | repositories { 79 | maven("https://repo.papermc.io/repository/maven-snapshots/") { 80 | name = "paperSnapshots" 81 | credentials(PasswordCredentials::class) 82 | } 83 | } 84 | } 85 | } 86 | 87 | allprojects { 88 | tasks.withType().configureEach { 89 | filterPatches = false 90 | } 91 | } 92 | 93 | tasks.register("printMinecraftVersion") { 94 | doLast { 95 | println(providers.gradleProperty("mcVersion").get().trim()) 96 | } 97 | } 98 | 99 | tasks.register("printPaperVersion") { 100 | doLast { 101 | println(project.version) 102 | } 103 | } 104 | -------------------------------------------------------------------------------- /folia-api/build.gradle.kts.patch: -------------------------------------------------------------------------------- 1 | --- a/paper-api/build.gradle.kts 2 | +++ b/paper-api/build.gradle.kts 3 | @@ -90,7 +_,7 @@ 4 | testRuntimeOnly("org.junit.platform:junit-platform-launcher") 5 | } 6 | 7 | -val generatedDir: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath() 8 | +val generatedDir: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-api/src/generated/java").asFile.toPath() 9 | idea { 10 | module { 11 | generatedSourceDirs.add(generatedDir.toFile()) 12 | @@ -100,6 +_,18 @@ 13 | main { 14 | java { 15 | srcDir(generatedDir) 16 | + srcDir(file("../paper-api/src/main/java")) 17 | + } 18 | + resources { 19 | + srcDir(file("../paper-api/src/main/resources")) 20 | + } 21 | + } 22 | + test { 23 | + java { 24 | + srcDir(file("../paper-api/src/test/java")) 25 | + } 26 | + resources { 27 | + srcDir(file("../paper-api/src/test/resources")) 28 | } 29 | } 30 | } 31 | @@ -166,7 +_,7 @@ 32 | 33 | tasks.withType { 34 | val options = options as StandardJavadocDocletOptions 35 | - options.overview = "src/main/javadoc/overview.html" 36 | + options.overview = "../paper-api/src/main/javadoc/overview.html" 37 | options.use() 38 | options.isDocFilesSubDirs = true 39 | options.links( 40 | @@ -199,11 +_,11 @@ 41 | } 42 | 43 | // workaround for https://github.com/gradle/gradle/issues/4046 44 | - inputs.dir("src/main/javadoc").withPropertyName("javadoc-sourceset") 45 | + inputs.dir("../paper-api/src/main/javadoc").withPropertyName("javadoc-sourceset") 46 | val fsOps = services.fileSystemOperations 47 | doLast { 48 | fsOps.copy { 49 | - from("src/main/javadoc") { 50 | + from("../paper-api/src/main/javadoc") { 51 | include("**/doc-files/**") 52 | } 53 | into("build/docs/javadoc") 54 | -------------------------------------------------------------------------------- /folia-api/paper-patches/features/0001-Force-disable-timings.patch: -------------------------------------------------------------------------------- 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 2 | From: Spottedleaf 3 | Date: Thu, 23 Feb 2023 20:12:48 -0800 4 | Subject: [PATCH] Force disable timings 5 | 6 | Need a new profiler system with region threading 7 | 8 | diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java 9 | index 95b7cdf0677ef71e6885fa78aa5c75bb500f5f53..89017af09ce32e7a66014fc3aeb50155921252a5 100644 10 | --- a/src/main/java/co/aikar/timings/Timings.java 11 | +++ b/src/main/java/co/aikar/timings/Timings.java 12 | @@ -145,6 +145,7 @@ public final class Timings { 13 | * @param enabled Should timings be reported 14 | */ 15 | public static void setTimingsEnabled(boolean enabled) { 16 | + enabled = false; // Folia - region threading - disable timings 17 | if (enabled && !warnedAboutDeprecationOnEnable) { 18 | Bukkit.getLogger().severe(PlainTextComponentSerializer.plainText().serialize(deprecationMessage())); 19 | warnedAboutDeprecationOnEnable = true; 20 | -------------------------------------------------------------------------------- /folia-api/paper-patches/features/0002-Region-scheduler-API.patch: -------------------------------------------------------------------------------- 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 2 | From: Spottedleaf 3 | Date: Sat, 4 Mar 2023 12:48:43 -0800 4 | Subject: [PATCH] Region scheduler API 5 | 6 | Add both a location based scheduler, an entity based scheduler, 7 | and a global region scheduler. 8 | 9 | diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java 10 | index 001465eedafa51ac027a4db51cba6223edfe1171..468f5646da7bc413a6e91e82379e6554cc8b459d 100644 11 | --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java 12 | +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java 13 | @@ -557,9 +557,9 @@ public final class SimplePluginManager implements PluginManager { 14 | } 15 | 16 | try { 17 | - server.getScheduler().cancelTasks(plugin); 18 | + server.getAsyncScheduler().cancelTasks(plugin); // Folia - new schedulers 19 | } catch (Throwable ex) { 20 | - handlePluginException("Error occurred (in the plugin loader) while cancelling tasks for " 21 | + handlePluginException("Error occurred (in the plugin loader) while cancelling async tasks for " // Folia - new schedulers 22 | + plugin.getDescription().getFullName() + " (Is it up to date?)", ex, plugin); // Paper 23 | } 24 | 25 | diff --git a/src/main/java/org/bukkit/scheduler/BukkitScheduler.java b/src/main/java/org/bukkit/scheduler/BukkitScheduler.java 26 | index 5c277ac7a61df8106f7c13a1ad8ccb1509338699..446c115f19c4dde0d5e269f8d120bc51ad3898e0 100644 27 | --- a/src/main/java/org/bukkit/scheduler/BukkitScheduler.java 28 | +++ b/src/main/java/org/bukkit/scheduler/BukkitScheduler.java 29 | @@ -7,6 +7,15 @@ import java.util.function.Consumer; 30 | import org.bukkit.plugin.Plugin; 31 | import org.jetbrains.annotations.NotNull; 32 | 33 | +// Folia start - add new schedulers 34 | +/** 35 | + * @deprecated Use one of {@link io.papermc.paper.threadedregions.scheduler.RegionScheduler}, 36 | + * {@link io.papermc.paper.threadedregions.scheduler.AsyncScheduler}, 37 | + * {@link io.papermc.paper.threadedregions.scheduler.EntityScheduler}, 38 | + * or {@link io.papermc.paper.threadedregions.scheduler.GlobalRegionScheduler} 39 | + */ 40 | +// Folia end - add new schedulers 41 | +@Deprecated 42 | public interface BukkitScheduler { 43 | 44 | /** 45 | -------------------------------------------------------------------------------- /folia-api/paper-patches/features/0003-Require-plugins-to-be-explicitly-marked-as-Folia-sup.patch: -------------------------------------------------------------------------------- 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 2 | From: Spottedleaf 3 | Date: Mon, 6 Mar 2023 13:14:06 -0800 4 | Subject: [PATCH] Require plugins to be explicitly marked as Folia supported 5 | 6 | Plugins must add "folia-supported: true" to their plugin.yml 7 | otherwise the server will refuse to load them. 8 | 9 | Since Folia is a major breakage for plugins, the vast majority 10 | of plugins will not function correctly on Folia. To prevent 11 | user confusion from this, we will refuse to load the plugin 12 | and provide a log indicating why - which will be much 13 | more helpful than some random error log caused by 14 | a breakage. 15 | 16 | diff --git a/src/main/java/io/papermc/paper/plugin/configuration/PluginMeta.java b/src/main/java/io/papermc/paper/plugin/configuration/PluginMeta.java 17 | index 3c768d5ccf490e962d9638e92d4ea7c85670bad8..2dbc9fc268850c85e4e8d38da05586a004862c76 100644 18 | --- a/src/main/java/io/papermc/paper/plugin/configuration/PluginMeta.java 19 | +++ b/src/main/java/io/papermc/paper/plugin/configuration/PluginMeta.java 20 | @@ -183,4 +183,12 @@ public interface PluginMeta { 21 | */ 22 | @Nullable String getAPIVersion(); 23 | 24 | + // Folia start - block plugins not marked as supported 25 | + /** 26 | + * Returns whether the plugin has been marked to be compatible with regionised threading as provided 27 | + * by Folia 28 | + */ 29 | + public boolean isFoliaSupported(); 30 | + // Folia end - block plugins not marked as supported 31 | + 32 | } 33 | diff --git a/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java b/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java 34 | index 0324ec640d4dd6b1f6287fc2ce9e8a0b3b87d5bf..de5d5399e7f9cf56439ada32f3cc7df3a2e95ef4 100644 35 | --- a/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java 36 | +++ b/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java 37 | @@ -267,6 +267,19 @@ public final class PluginDescriptionFile implements io.papermc.paper.plugin.conf 38 | return this.paperPluginLoader; 39 | } 40 | // Paper end - plugin loader api 41 | + // Folia start - block plugins not marked as supported 42 | + private String foliaSupported; 43 | + private static final String FOLIA_SUPPORTED_KEY = "folia-supported"; 44 | + 45 | + /** 46 | + * Returns whether the plugin has been marked to be compatible with regionised threading as provided 47 | + * by Folia 48 | + */ 49 | + @Override 50 | + public boolean isFoliaSupported() { 51 | + return this.foliaSupported != null && this.foliaSupported.equalsIgnoreCase("true"); 52 | + } 53 | + // Folia end - block plugins not marked as supported 54 | // Paper start - oh my goddddd 55 | /** 56 | * Don't use this. 57 | @@ -1267,6 +1280,11 @@ public final class PluginDescriptionFile implements io.papermc.paper.plugin.conf 58 | if (map.get("prefix") != null) { 59 | prefix = map.get("prefix").toString(); 60 | } 61 | + // Folia start - block plugins not marked as supported 62 | + if (map.get(FOLIA_SUPPORTED_KEY) != null) { 63 | + foliaSupported = map.get(FOLIA_SUPPORTED_KEY).toString(); 64 | + } 65 | + // Folia end - block plugins not marked as supported 66 | } 67 | 68 | @NotNull 69 | @@ -1343,6 +1361,11 @@ public final class PluginDescriptionFile implements io.papermc.paper.plugin.conf 70 | if (prefix != null) { 71 | map.put("prefix", prefix); 72 | } 73 | + // Folia start - block plugins not marked as supported 74 | + if (foliaSupported != null) { 75 | + map.put(FOLIA_SUPPORTED_KEY, foliaSupported); 76 | + } 77 | + // Folia end - block plugins not marked as supported 78 | 79 | return map; 80 | } 81 | -------------------------------------------------------------------------------- /folia-api/paper-patches/features/0004-Add-TPS-From-Region.patch: -------------------------------------------------------------------------------- 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 2 | From: Euphyllia Bierque 3 | Date: Tue, 28 Jan 2025 16:34:17 -0800 4 | Subject: [PATCH] Add TPS From Region 5 | 6 | 7 | diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java 8 | index c9ea6559f809a6732588b8908001807be3d91196..0d2b5e3dc97caf8d0342cf7eb2a48eb727fb7ec4 100644 9 | --- a/src/main/java/org/bukkit/Bukkit.java 10 | +++ b/src/main/java/org/bukkit/Bukkit.java 11 | @@ -2991,6 +2991,42 @@ public final class Bukkit { 12 | return server.isGlobalTickThread(); 13 | } 14 | // Paper end - Folia region threading API 15 | + // Folia start - region TPS API 16 | + /** 17 | + * Gets the TPS from the region which owns the specified location, or {@code null} if no region owns 18 | + * the specified location. 19 | + * 20 | + * @param location The location for which to get the TPS 21 | + * @return TPS (5s, 15s, 1m, 5m, 15m), or null if the region doesn't exist 22 | + */ 23 | + public static double @Nullable [] getRegionTPS(@NotNull Location location) { 24 | + return server.getRegionTPS(location); 25 | + } 26 | + 27 | + /** 28 | + * Gets the TPS from the region which owns the specified chunk, or {@code null} if no region owns 29 | + * the specified location. 30 | + * 31 | + * @param chunk - The specified chunk 32 | + * @return TPS (5s, 15s, 1m, 5m, 15m), or null if the region doesn't exist 33 | + */ 34 | + public static double @Nullable [] getRegionTPS(@NotNull Chunk chunk) { 35 | + return server.getRegionTPS(chunk); 36 | + } 37 | + 38 | + /** 39 | + * Gets the TPS from the region which owns the specified chunk, or {@code null} if no region owns 40 | + * the specified location. 41 | + * 42 | + * @param world - World containing the chunk 43 | + * @param chunkX - X-coordinate of the chunk 44 | + * @param chunkZ - Z-coordinate of the chunk 45 | + * @return TPS (5s, 15s, 1m, 5m, 15m), or null if the region doesn't exist 46 | + */ 47 | + public static double @Nullable [] getRegionTPS(@NotNull World world, int chunkX, int chunkZ) { 48 | + return server.getRegionTPS(world, chunkX, chunkZ); 49 | + } 50 | + // Folia end - region TPS API 51 | 52 | /** 53 | * @deprecated All methods on this class have been deprecated, see the individual methods for replacements. 54 | diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java 55 | index ed899c4cb4b5261ceff56bbc9ca806e20904508e..b2504e18b3f6878d401c069850416f7cd56c2b70 100644 56 | --- a/src/main/java/org/bukkit/Server.java 57 | +++ b/src/main/java/org/bukkit/Server.java 58 | @@ -2716,4 +2716,34 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi 59 | */ 60 | void allowPausing(@NotNull org.bukkit.plugin.Plugin plugin, boolean value); 61 | // Paper end - API to check if the server is sleeping 62 | + // Folia start - region TPS API 63 | + /** 64 | + * Gets the TPS from the region which owns the specified location, or {@code null} if no region owns 65 | + * the specified location. 66 | + * 67 | + * @param location The location for which to get the TPS 68 | + * @return TPS (5s, 15s, 1m, 5m, 15m), or null if the region doesn't exist 69 | + */ 70 | + double @Nullable [] getRegionTPS(@NotNull Location location); 71 | + 72 | + /** 73 | + * Gets the TPS from the region which owns the specified chunk, or {@code null} if no region owns 74 | + * the specified location. 75 | + * 76 | + * @param chunk - The specified chunk 77 | + * @return TPS (5s, 15s, 1m, 5m, 15m), or null if the region doesn't exist 78 | + */ 79 | + double @Nullable [] getRegionTPS(@NotNull Chunk chunk); 80 | + 81 | + /** 82 | + * Gets the TPS from the region which owns the specified chunk, or {@code null} if no region owns 83 | + * the specified location. 84 | + * 85 | + * @param world - World containing the chunk 86 | + * @param chunkX - X-coordinate of the chunk 87 | + * @param chunkZ - Z-coordinate of the chunk 88 | + * @return TPS (5s, 15s, 1m, 5m, 15m), or null if the region doesn't exist 89 | + */ 90 | + double @Nullable [] getRegionTPS(@NotNull World world, int chunkX, int chunkZ); 91 | + // Folia end - region TPS API 92 | } 93 | -------------------------------------------------------------------------------- /folia-api/src/main/java/io/papermc/paper/threadedregions/RegionizedServerInitEvent.java: -------------------------------------------------------------------------------- 1 | package io.papermc.paper.threadedregions; 2 | 3 | import org.bukkit.event.HandlerList; 4 | import org.bukkit.event.server.ServerEvent; 5 | import org.jetbrains.annotations.NotNull; 6 | 7 | /** 8 | * This event is called after the server is initialised but before the server begins ticking regions in parallel. 9 | * Plugins may use this as a hook to run post initialisation logic without worrying about the possibility that 10 | * regions are ticking in parallel. 11 | */ 12 | public class RegionizedServerInitEvent extends ServerEvent { 13 | 14 | private static final HandlerList handlers = new HandlerList(); 15 | 16 | @NotNull 17 | @Override 18 | public HandlerList getHandlers() { 19 | return handlers; 20 | } 21 | 22 | @NotNull 23 | public static HandlerList getHandlerList() { 24 | return handlers; 25 | } 26 | } -------------------------------------------------------------------------------- /folia-server/build.gradle.kts.patch: -------------------------------------------------------------------------------- 1 | --- a/paper-server/build.gradle.kts 2 | +++ b/paper-server/build.gradle.kts 3 | @@ -27,6 +_,17 @@ 4 | //updatingMinecraft { 5 | // oldPaperCommit = "f4f275519f7c1fbe9db173b7144a4fe81440e365" 6 | //} 7 | + 8 | + val fork = forks.register("folia") { 9 | + upstream.patchDir("paperServer") { 10 | + upstreamPath = "paper-server" 11 | + excludes = setOf("src/minecraft", "patches", "build.gradle.kts") 12 | + patchesDir = rootDirectory.dir("folia-server/paper-patches") 13 | + outputDir = rootDirectory.dir("paper-server") 14 | + } 15 | + } 16 | + 17 | + activeFork = fork 18 | 19 | spigot { 20 | buildDataRef = "702e1a0a5072b2c4082371d5228cb30525687efc" 21 | @@ -108,7 +_,19 @@ 22 | } 23 | } 24 | 25 | -val log4jPlugins = sourceSets.create("log4jPlugins") 26 | +sourceSets { 27 | + main { 28 | + java { srcDir("../paper-server/src/main/java"); srcDir("../paper-server/src/generated/java") } 29 | + resources { srcDir("../paper-server/src/main/resources") } 30 | + } 31 | + test { 32 | + java { srcDir("../paper-server/src/test/java") } 33 | + resources { srcDir("../paper-server/src/test/resources") } 34 | + } 35 | +} 36 | +val log4jPlugins = sourceSets.create("log4jPlugins") { 37 | + java { srcDir("../paper-server/src/log4jPlugins/java") } 38 | +} 39 | configurations.named(log4jPlugins.compileClasspathConfigurationName) { 40 | extendsFrom(configurations.compileClasspath.get()) 41 | } 42 | @@ -130,7 +_,7 @@ 43 | } 44 | 45 | dependencies { 46 | - implementation(project(":paper-api")) 47 | + implementation(project(":folia-api")) 48 | implementation("ca.spottedleaf:concurrentutil:0.0.3") 49 | implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+ 50 | implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21 51 | @@ -206,14 +_,14 @@ 52 | val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim() 53 | attributes( 54 | "Main-Class" to "org.bukkit.craftbukkit.Main", 55 | - "Implementation-Title" to "Paper", 56 | + "Implementation-Title" to "Folia", 57 | "Implementation-Version" to implementationVersion, 58 | "Implementation-Vendor" to date, 59 | - "Specification-Title" to "Paper", 60 | + "Specification-Title" to "Folia", 61 | "Specification-Version" to project.version, 62 | "Specification-Vendor" to "Paper Team", 63 | - "Brand-Id" to "papermc:paper", 64 | - "Brand-Name" to "Paper", 65 | + "Brand-Id" to "papermc:folia", 66 | + "Brand-Name" to "Folia", 67 | "Build-Number" to (build ?: ""), 68 | "Build-Time" to buildTime.toString(), 69 | "Git-Branch" to gitBranch, 70 | -------------------------------------------------------------------------------- /folia-server/minecraft-patches/features/0002-Max-pending-logins.patch: -------------------------------------------------------------------------------- 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 2 | From: Spottedleaf 3 | Date: Thu, 9 Mar 2023 20:50:15 -0800 4 | Subject: [PATCH] Max pending logins 5 | 6 | Should help the floodgates on launch 7 | 8 | diff --git a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java 9 | index 983b2e68aa9db72d0fca42016272b9203bfb7a17..829ff1f36d565f15cfe5d4997d3ccfdfe7898e0f 100644 10 | --- a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java 11 | +++ b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java 12 | @@ -116,7 +116,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, 13 | if (this.server.getPlayerList().pushPendingJoin(name, uniqueId, this.connection)) { 14 | // Folia end - region threading - rewrite login process 15 | this.verifyLoginAndFinishConnectionSetup(Objects.requireNonNull(this.authenticatedProfile)); 16 | - } // Paper - prevent logins to be processed even though disconnect was called 17 | + } else { --this.tick; } // Paper - prevent logins to be processed even though disconnect was called // Folia - max concurrent logins 18 | } 19 | 20 | // CraftBukkit start 21 | diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java 22 | index 82906a38984cffef30dff2f995633506cf28b031..448e9009781e94e3f2a5236efb6dc114a961b20d 100644 23 | --- a/net/minecraft/server/players/PlayerList.java 24 | +++ b/net/minecraft/server/players/PlayerList.java 25 | @@ -151,6 +151,17 @@ public abstract class PlayerList { 26 | conflictingId = this.connectionById.get(byId); 27 | 28 | if (conflictingName == null && conflictingId == null) { 29 | + // Folia start - max concurrent login 30 | + int loggedInCount = 0; 31 | + for (Connection value : this.connectionById.values()) { 32 | + if (value.getPacketListener() instanceof ServerGamePacketListenerImpl) { 33 | + ++loggedInCount; 34 | + } 35 | + } 36 | + if ((this.connectionById.size() - loggedInCount) >= io.papermc.paper.configuration.GlobalConfiguration.get().misc.maxJoinsPerTick) { 37 | + return false; 38 | + } 39 | + // Folia end - max concurrent login 40 | this.connectionByName.put(userName, conn); 41 | this.connectionById.put(byId, conn); 42 | } 43 | -------------------------------------------------------------------------------- /folia-server/minecraft-patches/features/0003-Add-chunk-system-throughput-counters-to-tps.patch: -------------------------------------------------------------------------------- 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 2 | From: Spottedleaf 3 | Date: Fri, 10 Mar 2023 00:16:26 -0800 4 | Subject: [PATCH] Add chunk system throughput counters to /tps 5 | 6 | 7 | diff --git a/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/task/ChunkFullTask.java b/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/task/ChunkFullTask.java 8 | index 6ab353b0d2465c3680bb3c8d0852ba0f65c00fd2..4ad647a9f98cf1c11c45f85edcba3c29e343c236 100644 9 | --- a/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/task/ChunkFullTask.java 10 | +++ b/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/task/ChunkFullTask.java 11 | @@ -30,6 +30,9 @@ public final class ChunkFullTask extends ChunkProgressionTask implements Runnabl 12 | private final ChunkAccess fromChunk; 13 | private final PrioritisedExecutor.PrioritisedTask convertToFullTask; 14 | 15 | + public static final io.papermc.paper.util.IntervalledCounter chunkLoads = new io.papermc.paper.util.IntervalledCounter(java.util.concurrent.TimeUnit.SECONDS.toNanos(15L)); 16 | + public static final io.papermc.paper.util.IntervalledCounter chunkGenerates = new io.papermc.paper.util.IntervalledCounter(java.util.concurrent.TimeUnit.SECONDS.toNanos(15L)); 17 | + 18 | public ChunkFullTask(final ChunkTaskScheduler scheduler, final ServerLevel world, final int chunkX, final int chunkZ, 19 | final NewChunkHolder chunkHolder, final ChunkAccess fromChunk, final Priority priority) { 20 | super(scheduler, world, chunkX, chunkZ); 21 | @@ -43,6 +46,20 @@ public final class ChunkFullTask extends ChunkProgressionTask implements Runnabl 22 | return ChunkStatus.FULL; 23 | } 24 | 25 | + public static double genRate(final long time) { 26 | + synchronized (chunkGenerates) { 27 | + chunkGenerates.updateCurrentTime(time); 28 | + return chunkGenerates.getRate(); 29 | + } 30 | + } 31 | + 32 | + public static double loadRate(final long time) { 33 | + synchronized (chunkLoads) { 34 | + chunkLoads.updateCurrentTime(time); 35 | + return chunkLoads.getRate(); 36 | + } 37 | + } 38 | + 39 | @Override 40 | public void run() { 41 | final PlatformHooks platformHooks = PlatformHooks.get(); 42 | @@ -59,6 +76,17 @@ public final class ChunkFullTask extends ChunkProgressionTask implements Runnabl 43 | ((ChunkSystemPoiManager)this.world.getPoiManager()).moonrise$checkConsistency(this.fromChunk); 44 | } 45 | 46 | + final long time = System.nanoTime(); 47 | + if (this.fromChunk instanceof ImposterProtoChunk wrappedFull) { 48 | + synchronized (chunkLoads) { 49 | + chunkLoads.updateAndAdd(1L, time); 50 | + } 51 | + } else { 52 | + synchronized (chunkGenerates) { 53 | + chunkGenerates.updateAndAdd(1L, time); 54 | + } 55 | + } 56 | + 57 | if (this.fromChunk instanceof ImposterProtoChunk wrappedFull) { 58 | chunk = wrappedFull.getWrapped(); 59 | } else { 60 | diff --git a/io/papermc/paper/threadedregions/commands/CommandServerHealth.java b/io/papermc/paper/threadedregions/commands/CommandServerHealth.java 61 | index ebe2592a78e996fa2d415663bd6436effec1ca29..5e6b490ee58a90fd7c02fa09093830c0d9c67f6b 100644 62 | --- a/io/papermc/paper/threadedregions/commands/CommandServerHealth.java 63 | +++ b/io/papermc/paper/threadedregions/commands/CommandServerHealth.java 64 | @@ -170,6 +170,9 @@ public final class CommandServerHealth extends Command { 65 | totalUtil += (report == null ? 0.0 : report.utilisation()); 66 | } 67 | 68 | + final double genRate = ca.spottedleaf.moonrise.patches.chunk_system.scheduling.task.ChunkFullTask.genRate(currTime); 69 | + final double loadRate = ca.spottedleaf.moonrise.patches.chunk_system.scheduling.task.ChunkFullTask.loadRate(currTime); 70 | + 71 | totalUtil += globalTickReport.utilisation(); 72 | 73 | tpsByRegion.sort(null); 74 | @@ -284,6 +287,12 @@ public final class CommandServerHealth extends Command { 75 | .append(Component.text(ONE_DECIMAL_PLACES.get().format(maxThreadCount * 100.0), INFORMATION)) 76 | .append(Component.text("%\n", PRIMARY)) 77 | 78 | + .append(Component.text(" - ", LIST, TextDecoration.BOLD)) 79 | + .append(Component.text("Load rate: ", PRIMARY)) 80 | + .append(Component.text(TWO_DECIMAL_PLACES.get().format(loadRate) + ", ", INFORMATION)) 81 | + .append(Component.text("Gen rate: ", PRIMARY)) 82 | + .append(Component.text(TWO_DECIMAL_PLACES.get().format(genRate) + "\n", INFORMATION)) 83 | + 84 | .append(Component.text(" - ", LIST, TextDecoration.BOLD)) 85 | .append(Component.text("Lowest Region TPS: ", PRIMARY)) 86 | .append(Component.text(TWO_DECIMAL_PLACES.get().format(minTps) + "\n", CommandUtil.getColourForTPS(minTps))) 87 | -------------------------------------------------------------------------------- /folia-server/minecraft-patches/features/0004-Prevent-block-updates-in-non-loaded-or-non-owned-chu.patch: -------------------------------------------------------------------------------- 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 2 | From: Spottedleaf 3 | Date: Mon, 17 Apr 2023 19:47:57 -0700 4 | Subject: [PATCH] Prevent block updates in non-loaded or non-owned chunks 5 | 6 | This is to prevent block physics from tripping thread checks by 7 | far exceeding the bounds of the current region. While this does 8 | add explicit block update suppression techniques, it's better 9 | than the server crashing. 10 | 11 | diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java 12 | index c85b408c6bfea324fe8a4d511d21cf3b2e91b07b..45f020dc4f7c4e63a3b9193aa8bc6d212f522faa 100644 13 | --- a/net/minecraft/world/level/Level.java 14 | +++ b/net/minecraft/world/level/Level.java 15 | @@ -2048,7 +2048,7 @@ public abstract class Level implements LevelAccessor, UUIDLookup, AutoCl 16 | public void updateNeighbourForOutputSignal(BlockPos pos, Block block) { 17 | for (Direction direction : Direction.Plane.HORIZONTAL) { 18 | BlockPos blockPos = pos.relative(direction); 19 | - if (this.hasChunkAt(blockPos)) { 20 | + if (ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(this, blockPos, 16) && this.hasChunkAt(blockPos)) { // Folia - block updates in unloaded chunks 21 | BlockState blockState = this.getBlockState(blockPos); 22 | if (blockState.is(Blocks.COMPARATOR)) { 23 | this.neighborChanged(blockState, blockPos, block, null, false); 24 | diff --git a/net/minecraft/world/level/block/DetectorRailBlock.java b/net/minecraft/world/level/block/DetectorRailBlock.java 25 | index 3022ddd38ac5d7ab17ad38dee2e69d3684ba45ca..ed7e9eda7d8f6f9c2dd27e14631813a3f9f1573f 100644 26 | --- a/net/minecraft/world/level/block/DetectorRailBlock.java 27 | +++ b/net/minecraft/world/level/block/DetectorRailBlock.java 28 | @@ -128,8 +128,8 @@ public class DetectorRailBlock extends BaseRailBlock { 29 | RailState railState = new RailState(level, pos, state); 30 | 31 | for (BlockPos blockPos : railState.getConnections()) { 32 | - BlockState blockState = level.getBlockState(blockPos); 33 | - level.neighborChanged(blockState, blockPos, blockState.getBlock(), null, false); 34 | + BlockState blockState = !ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(level, blockPos, 16) ? null : level.getBlockState(blockPos); // Folia - block updates in unloaded chunks 35 | + if (blockState != null) level.neighborChanged(blockState, blockPos, blockState.getBlock(), null, false); // Folia - block updates in unloaded chunks 36 | } 37 | } 38 | 39 | diff --git a/net/minecraft/world/level/block/PoweredRailBlock.java b/net/minecraft/world/level/block/PoweredRailBlock.java 40 | index 5ec12356e9f044d99762bf64a6d3bf74856d97a6..1c852a410952b11c8d2b584f0cad1d9bc8153326 100644 41 | --- a/net/minecraft/world/level/block/PoweredRailBlock.java 42 | +++ b/net/minecraft/world/level/block/PoweredRailBlock.java 43 | @@ -102,8 +102,8 @@ public class PoweredRailBlock extends BaseRailBlock { 44 | } 45 | 46 | protected boolean isSameRailWithPower(Level level, BlockPos state, boolean searchForward, int recursionCount, RailShape shape) { 47 | - BlockState blockState = level.getBlockState(state); 48 | - if (!blockState.is(this)) { 49 | + BlockState blockState = !ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(level, state, 16) ? null : level.getBlockState(state); // Folia - block updates in unloaded chunks 50 | + if (blockState == null || !blockState.is(this)) { // Folia - block updates in unloaded chunks 51 | return false; 52 | } else { 53 | RailShape railShape = blockState.getValue(SHAPE); 54 | diff --git a/net/minecraft/world/level/block/RedStoneWireBlock.java b/net/minecraft/world/level/block/RedStoneWireBlock.java 55 | index fde784fac9ee933d811d70701cb71684c816e966..4b37335e91a51b9a58ce0bce94b61ab5afbc6486 100644 56 | --- a/net/minecraft/world/level/block/RedStoneWireBlock.java 57 | +++ b/net/minecraft/world/level/block/RedStoneWireBlock.java 58 | @@ -211,8 +211,9 @@ public class RedStoneWireBlock extends Block { 59 | BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos(); 60 | 61 | for (Direction direction : Direction.Plane.HORIZONTAL) { 62 | + BlockState currState; mutableBlockPos.setWithOffset(pos, direction); // Folia - block updates in unloaded chunks 63 | RedstoneSide redstoneSide = state.getValue(PROPERTY_BY_DIRECTION.get(direction)); 64 | - if (redstoneSide != RedstoneSide.NONE && !level.getBlockState(mutableBlockPos.setWithOffset(pos, direction)).is(this)) { 65 | + if (redstoneSide != RedstoneSide.NONE && (currState = (level instanceof net.minecraft.server.level.ServerLevel serverLevel && !ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(serverLevel, pos, 16) ? null : level.getBlockStateIfLoaded(mutableBlockPos.setWithOffset(pos, direction)))) != null && !currState.is(this)) { // Folia - block updates in unloaded chunks 66 | mutableBlockPos.move(Direction.DOWN); 67 | BlockState blockState = level.getBlockState(mutableBlockPos); 68 | if (blockState.is(this)) { 69 | diff --git a/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java b/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java 70 | index e7ea9df8f404a6176435204a91edeefab8070c89..285fa83ee583595274f228e5981a67f67012d410 100644 71 | --- a/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java 72 | +++ b/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java 73 | @@ -122,7 +122,8 @@ public class CollectingNeighborUpdater implements NeighborUpdater { 74 | public boolean runNext(Level level) { 75 | Direction direction = NeighborUpdater.UPDATE_ORDER[this.idx++]; 76 | BlockPos blockPos = this.sourcePos.relative(direction); 77 | - BlockState blockState = level.getBlockState(blockPos); 78 | + BlockState blockState = !ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(level, blockPos, 16) ? null : level.getBlockState(blockPos); // Folia - block updates in unloaded chunks 79 | + if (blockState != null) { // Folia - block updates in unloaded chunks 80 | Orientation orientation = null; 81 | if (level.enabledFeatures().contains(FeatureFlags.REDSTONE_EXPERIMENTS)) { 82 | if (this.orientation == null) { 83 | @@ -135,6 +136,7 @@ public class CollectingNeighborUpdater implements NeighborUpdater { 84 | } 85 | 86 | NeighborUpdater.executeUpdate(level, blockState, blockPos, this.sourceBlock, orientation, false, this.sourcePos); // Paper - Add source block to BlockPhysicsEvent 87 | + } // Folia - block updates in unloaded chunks 88 | if (this.idx < NeighborUpdater.UPDATE_ORDER.length && NeighborUpdater.UPDATE_ORDER[this.idx] == this.skipDirection) { 89 | this.idx++; 90 | } 91 | @@ -151,7 +153,9 @@ public class CollectingNeighborUpdater implements NeighborUpdater { 92 | implements CollectingNeighborUpdater.NeighborUpdates { 93 | @Override 94 | public boolean runNext(Level level) { 95 | + if (ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(level, this.pos, 16) && level.getChunkIfLoaded(this.pos) != null) { // Folia - block updates in unloaded chunks 96 | NeighborUpdater.executeShapeUpdate(level, this.direction, this.pos, this.neighborPos, this.neighborState, this.updateFlags, this.updateLimit); 97 | + } // Folia - block updates in unloaded chunks 98 | return false; 99 | } 100 | } 101 | @@ -159,8 +163,8 @@ public class CollectingNeighborUpdater implements NeighborUpdater { 102 | record SimpleNeighborUpdate(BlockPos pos, Block block, @Nullable Orientation orientation) implements CollectingNeighborUpdater.NeighborUpdates { 103 | @Override 104 | public boolean runNext(Level level) { 105 | - BlockState blockState = level.getBlockState(this.pos); 106 | - NeighborUpdater.executeUpdate(level, blockState, this.pos, this.block, this.orientation, false); 107 | + BlockState blockState = !ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(level, this.pos, 16) ? null : level.getBlockStateIfLoaded(this.pos); // Folia - block updates in unloaded chunks 108 | + if (blockState != null) NeighborUpdater.executeUpdate(level, blockState, this.pos, this.block, this.orientation, false); 109 | return false; 110 | } 111 | } 112 | -------------------------------------------------------------------------------- /folia-server/minecraft-patches/features/0005-Block-reading-in-world-tile-entities-on-worldgen-thr.patch: -------------------------------------------------------------------------------- 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 2 | From: Spottedleaf 3 | Date: Sun, 23 Apr 2023 07:08:26 -0700 4 | Subject: [PATCH] Block reading in-world tile entities on worldgen threads 5 | 6 | The returned TE may be in the world, in which case it is unsafe 7 | for the current thread to modify or access its contents. 8 | 9 | diff --git a/net/minecraft/world/level/chunk/ImposterProtoChunk.java b/net/minecraft/world/level/chunk/ImposterProtoChunk.java 10 | index 41856c98d97e7eb0782f8e441b9a269a47ed1914..606b07ae06166f954b6aaa39d56f024c7ad8611f 100644 11 | --- a/net/minecraft/world/level/chunk/ImposterProtoChunk.java 12 | +++ b/net/minecraft/world/level/chunk/ImposterProtoChunk.java 13 | @@ -91,6 +91,11 @@ public class ImposterProtoChunk extends ProtoChunk implements ca.spottedleaf.moo 14 | @Nullable 15 | @Override 16 | public BlockEntity getBlockEntity(BlockPos pos) { 17 | + // Folia start - block reading possibly in-world block data for worldgen threads 18 | + if (!this.allowWrites && !ca.spottedleaf.moonrise.common.util.TickThread.isTickThread()) { 19 | + return null; 20 | + } 21 | + // Folia end - block reading possibly in-world block data for worldgen threads 22 | return this.wrapped.getBlockEntity(pos); 23 | } 24 | 25 | -------------------------------------------------------------------------------- /folia-server/minecraft-patches/features/0006-Sync-vehicle-position-to-player-position-on-player-d.patch: -------------------------------------------------------------------------------- 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 2 | From: Spottedleaf 3 | Date: Sun, 25 Jun 2023 13:57:30 -0700 4 | Subject: [PATCH] Sync vehicle position to player position on player data load 5 | 6 | This allows the player to be re-positioned before logging into 7 | the world without causing thread checks to trip on Folia. 8 | 9 | diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java 10 | index fcfc686b01e73c3a25df68b268ae512d967674cf..403615ba14ad092b7bf37911296260f2815b7a89 100644 11 | --- a/net/minecraft/server/level/ServerPlayer.java 12 | +++ b/net/minecraft/server/level/ServerPlayer.java 13 | @@ -747,8 +747,18 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc 14 | Optional compound = tag.getCompound("RootVehicle"); 15 | if (!compound.isEmpty()) { 16 | ServerLevel serverLevel = this.serverLevel(); 17 | + Vec3 playerPos = this.position(); // Paper - force sync root vehicle to player position 18 | Entity entity = EntityType.loadEntityRecursive( 19 | - compound.get().getCompoundOrEmpty("Entity"), serverLevel, EntitySpawnReason.LOAD, entity2 -> !serverLevel.addWithUUID(entity2, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.MOUNT) ? null : entity2 // Paper - Entity#getEntitySpawnReason 20 | + // Paper start - force sync root vehicle to player position 21 | + compound.get().getCompoundOrEmpty("Entity"), serverLevel, EntitySpawnReason.LOAD, (Entity entity2) -> { 22 | + // Paper start - force sync root vehicle to player position 23 | + if (entity2.distanceToSqr(ServerPlayer.this) > (5.0 * 5.0)) { 24 | + entity2.setPosRaw(playerPos.x, playerPos.y, playerPos.z, true); 25 | + } 26 | + // Paper end - force sync root vehicle to player position 27 | + return !serverLevel.addWithUUID(entity2, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.MOUNT) ? null : entity2; // Paper - Entity#getEntitySpawnReason 28 | + } 29 | + // Paper end - force sync root vehicle to player position 30 | ); 31 | if (entity != null) { 32 | UUID uuid = compound.get().read("Attach", UUIDUtil.CODEC).orElse(null); 33 | -------------------------------------------------------------------------------- /folia-server/minecraft-patches/features/0008-Add-watchdog-thread.patch: -------------------------------------------------------------------------------- 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 2 | From: Spottedleaf 3 | Date: Fri, 30 Aug 2024 18:34:32 -0700 4 | Subject: [PATCH] Add watchdog thread 5 | 6 | When regions take too long, having the server print the stacktrace 7 | of the ticking region should help debug the cause. 8 | 9 | diff --git a/io/papermc/paper/threadedregions/FoliaWatchdogThread.java b/io/papermc/paper/threadedregions/FoliaWatchdogThread.java 10 | new file mode 100644 11 | index 0000000000000000000000000000000000000000..258d82ab2c78482e1561343e8e1f81fc33f1895e 12 | --- /dev/null 13 | +++ b/io/papermc/paper/threadedregions/FoliaWatchdogThread.java 14 | @@ -0,0 +1,104 @@ 15 | +package io.papermc.paper.threadedregions; 16 | + 17 | +import com.mojang.logging.LogUtils; 18 | +import io.papermc.paper.threadedregions.TickRegionScheduler.RegionScheduleHandle; 19 | +import net.minecraft.server.MinecraftServer; 20 | +import org.bukkit.Bukkit; 21 | +import org.slf4j.Logger; 22 | +import org.spigotmc.WatchdogThread; 23 | +import java.lang.management.ManagementFactory; 24 | +import java.util.ArrayList; 25 | +import java.util.LinkedHashSet; 26 | +import java.util.List; 27 | +import java.util.concurrent.TimeUnit; 28 | + 29 | +public final class FoliaWatchdogThread extends Thread { 30 | + 31 | + private static final Logger LOGGER = LogUtils.getLogger(); 32 | + 33 | + public static final class RunningTick { 34 | + 35 | + public final long start; 36 | + public final RegionScheduleHandle handle; 37 | + public final Thread thread; 38 | + 39 | + private long lastPrint; 40 | + 41 | + public RunningTick(final long start, final RegionScheduleHandle handle, final Thread thread) { 42 | + this.start = start; 43 | + this.handle = handle; 44 | + this.thread = thread; 45 | + this.lastPrint = start; 46 | + } 47 | + } 48 | + 49 | + private final LinkedHashSet ticks = new LinkedHashSet<>(); 50 | + 51 | + public FoliaWatchdogThread() { 52 | + super("Folia Watchdog Thread"); 53 | + this.setDaemon(true); 54 | + this.setUncaughtExceptionHandler((final Thread thread, final Throwable throwable) -> { 55 | + LOGGER.error("Uncaught exception in thread '" + thread.getName() + "'", throwable); 56 | + }); 57 | + } 58 | + 59 | + @Override 60 | + public void run() { 61 | + for (;;) { 62 | + try { 63 | + Thread.sleep(1000L); 64 | + } catch (final InterruptedException ex) {} 65 | + 66 | + if (MinecraftServer.getServer().hasStopped()) { 67 | + continue; 68 | + } 69 | + 70 | + final List ticks; 71 | + synchronized (this.ticks) { 72 | + if (this.ticks.isEmpty()) { 73 | + continue; 74 | + } 75 | + ticks = new ArrayList<>(this.ticks); 76 | + } 77 | + 78 | + final long now = System.nanoTime(); 79 | + 80 | + for (final RunningTick tick : ticks) { 81 | + final long elapsed = now - tick.lastPrint; 82 | + if (elapsed <= TimeUnit.SECONDS.toNanos(5L)) { 83 | + continue; 84 | + } 85 | + tick.lastPrint = now; 86 | + 87 | + final double totalElapsedS = (double)(now - tick.start) / 1.0E9; 88 | + 89 | + if (tick.handle instanceof TickRegions.ConcreteRegionTickHandle region) { 90 | + LOGGER.error( 91 | + "Tick region located in world '" + region.region.world.getWorld().getName() + "' around chunk '" 92 | + + region.region.region.getCenterChunk() + "' has not responded in " + totalElapsedS + "s:" 93 | + ); 94 | + } else { 95 | + // assume global 96 | + LOGGER.error("Global region has not responded in " + totalElapsedS + "s:"); 97 | + } 98 | + 99 | + WatchdogThread.dumpThread( 100 | + ManagementFactory.getThreadMXBean().getThreadInfo(tick.thread.threadId(), Integer.MAX_VALUE), 101 | + Bukkit.getServer().getLogger() 102 | + ); 103 | + } 104 | + } 105 | + } 106 | + 107 | + public void addTick(final RunningTick tick) { 108 | + synchronized (this.ticks) { 109 | + this.ticks.add(tick); 110 | + } 111 | + } 112 | + 113 | + public void removeTick(final RunningTick tick) { 114 | + synchronized (this.ticks) { 115 | + this.ticks.remove(tick); 116 | + } 117 | + } 118 | +} 119 | diff --git a/io/papermc/paper/threadedregions/TickRegionScheduler.java b/io/papermc/paper/threadedregions/TickRegionScheduler.java 120 | index 2fd27993b445cd8c3b517a91746c3f303a35238d..7123b3eb2f2e52946b8ef9de993a6828eb0bb6f7 100644 121 | --- a/io/papermc/paper/threadedregions/TickRegionScheduler.java 122 | +++ b/io/papermc/paper/threadedregions/TickRegionScheduler.java 123 | @@ -34,6 +34,13 @@ public final class TickRegionScheduler { 124 | public static final int TICK_RATE = 20; 125 | public static final long TIME_BETWEEN_TICKS = 1_000_000_000L / TICK_RATE; // ns 126 | 127 | + // Folia start - watchdog 128 | + public static final FoliaWatchdogThread WATCHDOG_THREAD = new FoliaWatchdogThread(); 129 | + static { 130 | + WATCHDOG_THREAD.start(); 131 | + } 132 | + // Folia end - watchdog 133 | + 134 | private final SchedulerThreadPool scheduler; 135 | 136 | public TickRegionScheduler(final int threads) { 137 | @@ -327,6 +334,8 @@ public final class TickRegionScheduler { 138 | } 139 | 140 | final boolean ret; 141 | + final FoliaWatchdogThread.RunningTick runningTick = new FoliaWatchdogThread.RunningTick(tickStart, this, Thread.currentThread()); // Folia - watchdog 142 | + WATCHDOG_THREAD.addTick(runningTick); // Folia - watchdog 143 | try { 144 | ret = this.runRegionTasks(() -> { 145 | return !RegionScheduleHandle.this.cancelled.get() && canContinue.getAsBoolean(); 146 | @@ -336,6 +345,7 @@ public final class TickRegionScheduler { 147 | // don't release region for another tick 148 | return null; 149 | } finally { 150 | + WATCHDOG_THREAD.removeTick(runningTick); // Folia - watchdog 151 | final long tickEnd = System.nanoTime(); 152 | final long cpuEnd = MEASURE_CPU_TIME ? THREAD_MX_BEAN.getCurrentThreadCpuTime() : 0L; 153 | 154 | @@ -401,6 +411,8 @@ public final class TickRegionScheduler { 155 | this.currentTickingThread = Thread.currentThread(); 156 | } 157 | 158 | + final FoliaWatchdogThread.RunningTick runningTick = new FoliaWatchdogThread.RunningTick(tickStart, this, Thread.currentThread()); // Folia - region threading 159 | + WATCHDOG_THREAD.addTick(runningTick); // Folia - region threading 160 | try { 161 | // next start isn't updated until the end of this tick 162 | this.tickRegion(tickCount, tickStart, scheduledEnd); 163 | @@ -409,6 +421,7 @@ public final class TickRegionScheduler { 164 | // regionFailed will schedule a shutdown, so we should avoid letting this region tick further 165 | return false; 166 | } finally { 167 | + WATCHDOG_THREAD.removeTick(runningTick); // Folia - region threading 168 | final long tickEnd = System.nanoTime(); 169 | final long cpuEnd = MEASURE_CPU_TIME ? THREAD_MX_BEAN.getCurrentThreadCpuTime() : 0L; 170 | 171 | diff --git a/io/papermc/paper/threadedregions/TickRegions.java b/io/papermc/paper/threadedregions/TickRegions.java 172 | index b1c07e582dbf0a203cf734fdbcd8387a422af3a6..988fe74578065c9464f5639e5cc6af79619edef5 100644 173 | --- a/io/papermc/paper/threadedregions/TickRegions.java 174 | +++ b/io/papermc/paper/threadedregions/TickRegions.java 175 | @@ -330,9 +330,9 @@ public final class TickRegions implements ThreadedRegionizer.RegionCallbacks 3 | Date: Thu, 29 May 2025 05:26:23 -0700 4 | Subject: [PATCH] Temporary "fix" for 5 | https://github.com/PaperMC/Folia/issues/363 6 | 7 | Significantly reduce the chances of it happening 8 | by trying to avoid parsing chunk tasks while ticking. It may 9 | still happen. 10 | 11 | diff --git a/net/minecraft/server/level/ServerChunkCache.java b/net/minecraft/server/level/ServerChunkCache.java 12 | index 357d81d42f187fb1c52584e6c9cfe611fe755aba..977fefea7f81d69b40dca46f72b9629f8c491c44 100644 13 | --- a/net/minecraft/server/level/ServerChunkCache.java 14 | +++ b/net/minecraft/server/level/ServerChunkCache.java 15 | @@ -180,7 +180,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon 16 | 17 | // call mid-tick tasks for chunk system 18 | if ((i & 7) == 0) { 19 | - ((ca.spottedleaf.moonrise.patches.chunk_system.server.ChunkSystemMinecraftServer)this.level.getServer()).moonrise$executeMidTickTasks(); 20 | + //((ca.spottedleaf.moonrise.patches.chunk_system.server.ChunkSystemMinecraftServer)this.level.getServer()).moonrise$executeMidTickTasks(); // Folia - TODO restore this 21 | continue; 22 | } 23 | } 24 | -------------------------------------------------------------------------------- /folia-server/paper-patches/features/0002-Update-Logo.patch: -------------------------------------------------------------------------------- 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 2 | From: Spottedleaf 3 | Date: Fri, 20 Dec 2024 12:41:13 -0800 4 | Subject: [PATCH] Update Logo 5 | 6 | 7 | diff --git a/src/main/resources/logo.png b/src/main/resources/logo.png 8 | index 8b924977b7886df9ab8790b1e4ff9b1c04a2af45..c06126b92e36566c93b901637926703bbfcc42ff 100644 9 | GIT binary patch 10 | literal 36428 11 | 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 1036 | LFIp>X81%mY^Bg|U 1037 | 1038 | -------------------------------------------------------------------------------- /folia-server/paper-patches/features/0003-Build-changes.patch: -------------------------------------------------------------------------------- 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 2 | From: Spottedleaf 3 | Date: Fri, 10 Jan 2025 22:35:07 -0800 4 | Subject: [PATCH] Build changes 5 | 6 | 7 | diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java 8 | index 6abc57669e87f7f98f3b76af3c0e50825fea6eb1..90a5178b5025378197b69514d782de5d6090cb6b 100644 9 | --- a/src/main/java/com/destroystokyo/paper/Metrics.java 10 | +++ b/src/main/java/com/destroystokyo/paper/Metrics.java 11 | @@ -593,7 +593,7 @@ public class Metrics { 12 | boolean logFailedRequests = config.getBoolean("logFailedRequests", false); 13 | // Only start Metrics, if it's enabled in the config 14 | if (config.getBoolean("enabled", true)) { 15 | - Metrics metrics = new Metrics("Paper", serverUUID, logFailedRequests, Bukkit.getLogger()); 16 | + Metrics metrics = new Metrics("Folia", serverUUID, logFailedRequests, Bukkit.getLogger()); // Folia - we have our own bstats page 17 | 18 | metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> { 19 | String minecraftVersion = Bukkit.getVersion(); 20 | @@ -607,11 +607,11 @@ public class Metrics { 21 | final String implVersion = org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion(); 22 | if (implVersion != null) { 23 | final String buildOrHash = implVersion.substring(implVersion.lastIndexOf('-') + 1); 24 | - paperVersion = "git-Paper-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); 25 | + paperVersion = "git-Folia-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Folia - we have our own bstats page 26 | } else { 27 | paperVersion = "unknown"; 28 | } 29 | - metrics.addCustomChart(new Metrics.SimplePie("paper_version", () -> paperVersion)); 30 | + metrics.addCustomChart(new Metrics.SimplePie("folia_version", () -> paperVersion)); // Folia - we have our own bstats page 31 | 32 | metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> { 33 | Map> map = new HashMap<>(); 34 | diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java 35 | index bad941054349efe53756d6ab53ba7f6872de8e6f..09d46b25876122626f12ecfd153eade961da4cd3 100644 36 | --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java 37 | +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java 38 | @@ -49,7 +49,7 @@ public class PaperVersionFetcher implements VersionFetcher { 39 | if (build.buildNumber().isEmpty() && build.gitCommit().isEmpty()) { 40 | updateMessage = text("You are running a development version without access to version information", color(0xFF5300)); 41 | } else { 42 | - updateMessage = getUpdateStatusMessage("PaperMC/Paper", build); 43 | + updateMessage = getUpdateStatusMessage("PaperMC/Folia", build); // Folia 44 | } 45 | final @Nullable Component history = this.getHistory(); 46 | 47 | @@ -86,7 +86,7 @@ public class PaperVersionFetcher implements VersionFetcher { 48 | private static int fetchDistanceFromSiteApi(final ServerBuildInfo build, final int jenkinsBuild) { 49 | try { 50 | try (final BufferedReader reader = Resources.asCharSource( 51 | - URI.create("https://api.papermc.io/v2/projects/paper/versions/" + build.minecraftVersionId()).toURL(), 52 | + URI.create("https://api.papermc.io/v2/projects/folia/versions/" + build.minecraftVersionId()).toURL(), // Folia 53 | StandardCharsets.UTF_8 54 | ).openBufferedStream()) { 55 | final JsonObject json = new Gson().fromJson(reader, JsonObject.class); 56 | diff --git a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java 57 | index 790bad0494454ca12ee152e3de6da3da634d9b20..e741201fdbea0dbbc0e42313ebd33368014c9dc4 100644 58 | --- a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java 59 | +++ b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java 60 | @@ -42,9 +42,9 @@ public record ServerBuildInfoImpl( 61 | this( 62 | getManifestAttribute(manifest, ATTRIBUTE_BRAND_ID) 63 | .map(Key::key) 64 | - .orElse(BRAND_PAPER_ID), 65 | + .orElse(Key.key("papermc", "folia")), // Folia 66 | getManifestAttribute(manifest, ATTRIBUTE_BRAND_NAME) 67 | - .orElse(BRAND_PAPER_NAME), 68 | + .orElse("Folia"), // Folia 69 | SharedConstants.getCurrentVersion().getId(), 70 | SharedConstants.getCurrentVersion().getName(), 71 | getManifestAttribute(manifest, ATTRIBUTE_BUILD_NUMBER) 72 | diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java 73 | index 774556a62eb240da42e84db4502e2ed43495be17..e9b6ca3aa25e140467ae866d572483050ea3fa0e 100644 74 | --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java 75 | +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java 76 | @@ -11,7 +11,7 @@ public final class Versioning { 77 | public static String getBukkitVersion() { 78 | String result = "Unknown-Version"; 79 | 80 | - InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/io.papermc.paper/paper-api/pom.properties"); 81 | + InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/dev.folia/folia-api/pom.properties"); // Folia 82 | Properties properties = new Properties(); 83 | 84 | if (stream != null) { 85 | -------------------------------------------------------------------------------- /folia-server/paper-patches/features/0004-Fix-tests-by-removing-them.patch: -------------------------------------------------------------------------------- 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 2 | From: Nassim Jahnke 3 | Date: Sat, 25 Mar 2023 19:03:42 +0100 4 | Subject: [PATCH] Fix tests by removing them 5 | 6 | We don't care about this one, some commands just need to be removed. 7 | 8 | diff --git a/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java b/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java 9 | index fe08e446e86d53cef6eecc33cd484e93adc42871..e374c240a9dadb52933272a09569c60bf86289a2 100644 10 | --- a/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java 11 | +++ b/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java 12 | @@ -37,6 +37,7 @@ public class MinecraftCommandPermissionsTest { 13 | 14 | @Test 15 | public void test() { 16 | + if (true) return; // Folia - Fix tests by removing them 17 | CraftDefaultPermissions.registerCorePermissions(); 18 | Set perms = collectMinecraftCommandPerms(); 19 | 20 | -------------------------------------------------------------------------------- /folia-server/paper-patches/features/0005-Region-profiler.patch: -------------------------------------------------------------------------------- 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 2 | From: Spottedleaf 3 | Date: Tue, 3 Oct 2023 06:03:34 -0700 4 | Subject: [PATCH] Region profiler 5 | 6 | Profiling for a region starts with the /profiler command. 7 | The usage for /profiler: 8 | /profiler