Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-29 20:09:17 +00:00
Code Issues Releases Activity

Move Purpur patches to first

Browse Source 
To reduce the difficulty on maintenance and reduce chances to fix conflicts on updating
This commit is contained in:
Dreeam
2025-10-01 16:18:54 -04:00
parent f0e4107ca4
commit 3b162fb788
213 changed files with 1239 additions and 1467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
leaf-api/paper-patches/features/0011-Purpur-API-Changes.patch → leaf-api/paper-patches/features/0001-Purpur-API-Changes.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur API Changes
Original license: MIT
Original project: https://github.com/PurpurMC/Purpur
Commit: 0c9140aff1fac81adb2edae1dc75cc8b069b8c3b
Commit: 9030575af3aad201072770067d7fba5abc745312
Patches listed below are removed in this patch, They exists in Gale or Leaf:
* "co/aikar/timings/TimedEventExecutor.java.patch"
@@ -52,10 +52,10 @@ index 8f39c993056ba5564f111f29d1f84bd014a4c95d..cc1afe2e179d5b0f3f5d9c5c730ca385
return GoalKey.of(type, NamespacedKey.minecraft(key));
}
diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
index f738bbcefe288474c5f591dda03d713850633854..c198304386e83edc2ec582fdf66d97d624004771 100644
index 652ff54e7c50412503725d628bfe72ed03059790..fb1fe2651e53a9bf46b3632c638e13eea9dcda93 100644
--- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
+++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
@@ -19,6 +19,13 @@ public interface ServerBuildInfo {
@@ -19,6 +19,12 @@ public interface ServerBuildInfo {
*/
Key BRAND_PAPER_ID = Key.key("papermc", "paper");
@@ -65,15 +65,14 @@ index f738bbcefe288474c5f591dda03d713850633854..c198304386e83edc2ec582fdf66d97d6
+ */
+ Key BRAND_PURPUR_ID = Key.key("purpurmc", "purpur");
+ // Purpur end
+
// Leaf start - Rebrand
/**
* The brand id for Gale.
* Gets the {@code ServerBuildInfo}.
*
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index ffb2f5d949cc255263674b2a03d4da809b0c36c5..f04f42832a098836bf41e98787c2db35d154c892 100644
index 3bde4ad79ade5aae18e9073307f637717e8dd9e3..bb21401d142e2a9385d52afe40c54d793103afe2 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -3082,4 +3082,133 @@ public final class Bukkit {
@@ -3016,4 +3016,133 @@ public final class Bukkit {
public static void restart() {
server.restart();
}
@@ -444,11 +443,11 @@ index 6f83097b1097d0ffa81a95e6f0300cb410dfee2b..c1f19d5c1b819873fce1185b4fbf4c72
+ // Purpur end - OfflinePlayer API
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index ad65ee800d9d394d0322e7ca0b71972d81ca66a1..cc12db46d30c2499dea87f953ef6bf1fa18900c9 100644
index 9bab00ab10c78908090c8a1a12d4c84e9324b08b..69c0ca1b0c0cdbc911ba3f053fafc5624539917d 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2445,6 +2445,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2387,6 +2387,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
}
// Paper end
+ // Purpur start
@@ -466,10 +465,10 @@ index ad65ee800d9d394d0322e7ca0b71972d81ca66a1..cc12db46d30c2499dea87f953ef6bf1f
/**
* Sends the component to the player
*
@@ -2806,4 +2818,111 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2723,4 +2735,111 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
long getLastTickOversleepTime();
// Gale end - YAPFA - last tick time - API
void allowPausing(@NotNull org.bukkit.plugin.Plugin plugin, boolean value);
// Paper end - API to check if the server is sleeping
+
+ // Purpur start - Bring back server name
+ /**
@@ -1008,10 +1007,10 @@ index bc84b892cae5fe7019a3ad481e9da79956efa1fe..48eb5b00c460cccde29d327cef1d63fc
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 65d8986532f89ef4a51dcad7bf779327810efce8..f2dc9ae68a373d9d1d02cc103c9253496eaa0962 100644
index 672d78811b27d046bea2fb60a5cd8da387d37b92..18ab7ed5819510f6ee6de380cdbb0cff2493f58f 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3942,4 +3942,123 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3932,4 +3932,123 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
@ApiStatus.Experimental
PlayerGameConnection getConnection();

9
leaf-api/paper-patches/features/0001-Rebrand.patch → leaf-api/paper-patches/features/0002-Rebrand.patch
View File

@@ -49,13 +49,14 @@ index 94a9ed024d3859793618152ea559a168bbcbb5e2..e60008693e017bec1b4eb49c84be3898
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
index 652ff54e7c50412503725d628bfe72ed03059790..f738bbcefe288474c5f591dda03d713850633854 100644
index fb1fe2651e53a9bf46b3632c638e13eea9dcda93..c198304386e83edc2ec582fdf66d97d624004771 100644
--- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
+++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
@@ -19,6 +19,21 @@ public interface ServerBuildInfo {
@@ -25,6 +25,22 @@ public interface ServerBuildInfo {
*/
Key BRAND_PAPER_ID = Key.key("papermc", "paper");
Key BRAND_PURPUR_ID = Key.key("purpurmc", "purpur");
// Purpur end
+
+ // Leaf start - Rebrand
+ /**
+ * The brand id for Gale.

4
leaf-api/paper-patches/features/0002-Gale-configuration.patch → leaf-api/paper-patches/features/0003-Gale-configuration.patch
View File

@@ -13,7 +13,7 @@ As part of: Paper (https://github.com/PaperMC/Paper)
Licensed under: MIT (https://opensource.org/licenses/MIT)
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 9bab00ab10c78908090c8a1a12d4c84e9324b08b..544791edbd13d4ee711d22e6c8ef48329944e99c 100644
index 69c0ca1b0c0cdbc911ba3f053fafc5624539917d..26b2555d9fa69f10178c6ed4e2989aaa7c8ab910 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2385,6 +2385,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -37,4 +37,4 @@ index 9bab00ab10c78908090c8a1a12d4c84e9324b08b..544791edbd13d4ee711d22e6c8ef4832
+
// Paper end
/**
// Purpur start

0
leaf-api/paper-patches/features/0003-SIMD-support.patch → leaf-api/paper-patches/features/0004-SIMD-support.patch
View File

0
leaf-api/paper-patches/features/0004-Vectorized-map-color-conversion.patch → leaf-api/paper-patches/features/0005-Vectorized-map-color-conversion.patch
View File

0
leaf-api/paper-patches/features/0005-Do-not-log-plugin-library-loads.patch → leaf-api/paper-patches/features/0006-Do-not-log-plugin-library-loads.patch
View File

2
leaf-api/paper-patches/features/0006-Player-canSee-by-entity-UUID.patch → leaf-api/paper-patches/features/0007-Player-canSee-by-entity-UUID.patch
View File

@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 3584ca0a89f59e391ab6d5be8f2274a6801d025f..cc663ca87a6f64ea891984c72554796f25bb308f 100644
index 18ab7ed5819510f6ee6de380cdbb0cff2493f58f..f2dc9ae68a373d9d1d02cc103c9253496eaa0962 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2128,6 +2128,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

4
leaf-api/paper-patches/features/0007-Specific-interval-TPS-API.patch → leaf-api/paper-patches/features/0008-Specific-interval-TPS-API.patch
View File

@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 3bde4ad79ade5aae18e9073307f637717e8dd9e3..bac8bf1996350e4c16ba9a494c5d9bf052ad7fa3 100644
index bb21401d142e2a9385d52afe40c54d793103afe2..e64bea6d644154158c0d787ea0dec9f1bdbb69bd 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2447,6 +2447,35 @@ public final class Bukkit {
@@ -47,7 +47,7 @@ index 3bde4ad79ade5aae18e9073307f637717e8dd9e3..bac8bf1996350e4c16ba9a494c5d9bf0
* Get a sample of the servers last tick times (in nanos)
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 544791edbd13d4ee711d22e6c8ef48329944e99c..ee28284f665cd343930b8c0419009c7420830a67 100644
index 26b2555d9fa69f10178c6ed4e2989aaa7c8ab910..64172120596544caee8fc7ffe6e8e80a7472686f 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2133,6 +2133,29 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

4
leaf-api/paper-patches/features/0008-5-second-TPS-average.patch → leaf-api/paper-patches/features/0009-5-second-TPS-average.patch
View File

@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index bac8bf1996350e4c16ba9a494c5d9bf052ad7fa3..c899da328fca4dccbf69b2e2d74bcdf31e0e2c33 100644
index e64bea6d644154158c0d787ea0dec9f1bdbb69bd..71e782a1136e828e72021f628cc98887a98bf9d6 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2447,7 +2447,30 @@ public final class Bukkit {
@@ -72,7 +72,7 @@ index bac8bf1996350e4c16ba9a494c5d9bf052ad7fa3..c899da328fca4dccbf69b2e2d74bcdf3
* Gets the average server TPS over the last 1 minute
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index ee28284f665cd343930b8c0419009c7420830a67..c067cd28639dada3aaea71298ad78969ddb79954 100644
index 64172120596544caee8fc7ffe6e8e80a7472686f..287e14dd943f78fd86b1deb328cacaed4c530299 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2133,7 +2133,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

10
leaf-api/paper-patches/features/0009-Last-tick-time-API.patch → leaf-api/paper-patches/features/0010-Last-tick-time-API.patch
View File

@@ -23,7 +23,7 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index c899da328fca4dccbf69b2e2d74bcdf31e0e2c33..ffb2f5d949cc255263674b2a03d4da809b0c36c5 100644
index 71e782a1136e828e72021f628cc98887a98bf9d6..f04f42832a098836bf41e98787c2db35d154c892 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -3053,6 +3053,20 @@ public final class Bukkit {
@@ -48,13 +48,13 @@ index c899da328fca4dccbf69b2e2d74bcdf31e0e2c33..ffb2f5d949cc255263674b2a03d4da80
* @deprecated All methods on this class have been deprecated, see the individual methods for replacements.
*/
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index c067cd28639dada3aaea71298ad78969ddb79954..ad65ee800d9d394d0322e7ca0b71972d81ca66a1 100644
index 287e14dd943f78fd86b1deb328cacaed4c530299..d37a455c9d775b0dcb2e10fe8b0dc4c5c7aacae7 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2781,4 +2781,29 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2900,4 +2900,29 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
void allowPausing(@NotNull org.bukkit.plugin.Plugin plugin, boolean value);
// Paper end - API to check if the server is sleeping
void clearBlockHighlights();
// Purpur end - Debug Marker API
+
+ // Gale start - YAPFA - last tick time - API
+ /**

0
leaf-api/paper-patches/features/0010-Pufferfish-Sentry.patch → leaf-api/paper-patches/features/0011-Pufferfish-Sentry.patch
View File

8
leaf-api/paper-patches/features/0017-Leaves-Replay-Mod-API.patch
View File

@@ -11,7 +11,7 @@ Original project: https://github.com/LeavesMC/Leaves
This patch is Powered by ReplayMod(https://github.com/ReplayMod)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index f04f42832a098836bf41e98787c2db35d154c892..b7782de2fb8e636e82a6ef89a62edeec902b367e 100644
index f04f42832a098836bf41e98787c2db35d154c892..a1318ed9f8c321bff24de55a719a54ec80b13422 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -3211,4 +3211,10 @@ public final class Bukkit {
@@ -26,13 +26,13 @@ index f04f42832a098836bf41e98787c2db35d154c892..b7782de2fb8e636e82a6ef89a62edeec
+ // Leaves end - Photographer API
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index cc12db46d30c2499dea87f953ef6bf1fa18900c9..0d8463905bc15382c284fc31a1be6fbb7ee0a46b 100644
index d37a455c9d775b0dcb2e10fe8b0dc4c5c7aacae7..5e5a4fa36f48f6c67096cc678a3bcbaee684785f 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2925,4 +2925,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
void clearBlockHighlights();
// Purpur end - Debug Marker API
long getLastTickOversleepTime();
// Gale end - YAPFA - last tick time - API
+
+ // Leaves start - Photographer API
+ @NotNull org.leavesmc.leaves.entity.photographer.PhotographerManager getPhotographerManager();