Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-19 14:59:29 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@597dcfff Add support for lz4 (#12053)
PaperMC/Paper@53ae5c95 Make Sittable interface extend Entity (#12016)
PaperMC/Paper@786ddf53 Default piston block entity direction to DOWN (#12039)
PaperMC/Paper@cb6c57e0 Fix Squid and Dolphin spawn height (#12045)
PaperMC/Paper@51acc802 Prevent duplicate raider in RaidSpawnWaveEvent list (#12040)
PaperMC/Paper@61312fdb Switch to jspecify annotations for Player (#12042)
PaperMC/Paper@1a04e96a Fix EntityBreedEvent cancellation (#12046)
PaperMC/Paper@eff617b8 [ci/skip] Deprecate Server#setSpawnRadius (#12024)
PaperMC/Paper@edacfdf4 Do not queue player info packets (#12080)
PaperMC/Paper@cafef9ce [ci/skip] Move EntityUtil to correct directory (#12092)
This commit is contained in:
Dreeam
2025-02-10 10:25:21 -05:00
parent 9c48e95c26
commit 1c139da5f2
11 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gale-api/paper-patches/features/0002-Gale-configuration.patch
View File

@@ -13,10 +13,10 @@ 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 11923ef0ea75f702273ba5481ac6d46cc0f17697..6442b6d51f6821ff6a703aad1493ad1cafe0d659 100644
index fa6f9d50577059d99ee98662497f3fc049fa74ac..58d90c31ccb7af33aaa4b8b4a38ac17150bb5d02 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2328,6 +2328,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2332,6 +2332,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
{
throw new UnsupportedOperationException("Not supported yet.");
}

8
gale-api/paper-patches/features/0007-Player-canSee-by-entity-UUID.patch
View File

@@ -37,11 +37,11 @@ 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 7d21ee64c9b9c14412a1eddb63fae812a91e7d9c..1ee59ed42de64ae1a0a580b3f640cdcb5f51c71b 100644
index 0081dd53b6a81ce7892e58d61f9f8a6718e30775..a6356997a51a441ca65414dd7e3579c1c0f885d4 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2154,6 +2154,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
boolean listPlayer(@NotNull Player other);
@@ -2137,6 +2137,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
boolean listPlayer(Player other);
// Paper end
+ // Gale start - Purpur - Player#canSee by entity UUID
@@ -51,7 +51,7 @@ index 7d21ee64c9b9c14412a1eddb63fae812a91e7d9c..1ee59ed42de64ae1a0a580b3f640cdcb
+ * @param entityUUID The {@link Entity#getUniqueId()} of the entity to check
+ * @return True if the entity with the provided UUID is not being hidden from this player
+ */
+ boolean canSeePlayer(@NotNull UUID entityUUID);
+ boolean canSeePlayer(UUID entityUUID);
+ // Gale end - Purpur - Player#canSee by entity UUID
+
/**

8
gale-api/paper-patches/features/0008-Specific-interval-TPS-API.patch
View File

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 9196b1e62b328b1e9790b966600aba9681dd0ddc..3a4e3f5b2aec6c53adb9f812552a594a70141c13 100644
index 9764489c0801eecb8bbfb06103607f0902bf23ab..540020bd2138fab06f89ed233b6b7f97b3036137 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2422,6 +2422,35 @@ public final class Bukkit {
@@ -2426,6 +2426,35 @@ public final class Bukkit {
return server.getTPS();
}
@@ -47,10 +47,10 @@ index 9196b1e62b328b1e9790b966600aba9681dd0ddc..3a4e3f5b2aec6c53adb9f812552a594a
* 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 6442b6d51f6821ff6a703aad1493ad1cafe0d659..45837e97d83d1d636a13920bbba59d7388c16477 100644
index 58d90c31ccb7af33aaa4b8b4a38ac17150bb5d02..7b8c8a4993dc3cf454204121cefb42fd8ec435de 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2108,6 +2108,29 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2112,6 +2112,29 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
public double @NotNull [] getTPS();

8
gale-api/paper-patches/features/0009-5-second-TPS-average.patch
View File

@@ -37,10 +37,10 @@ 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 3a4e3f5b2aec6c53adb9f812552a594a70141c13..d975042cdca36112c918b9617bd5ed335c47cd20 100644
index 540020bd2138fab06f89ed233b6b7f97b3036137..d23700abf825d29832ee99d091faf693d4c381e9 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2422,7 +2422,30 @@ public final class Bukkit {
@@ -2426,7 +2426,30 @@ public final class Bukkit {
return server.getTPS();
}
@@ -72,10 +72,10 @@ index 3a4e3f5b2aec6c53adb9f812552a594a70141c13..d975042cdca36112c918b9617bd5ed33
* 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 45837e97d83d1d636a13920bbba59d7388c16477..5117891d90162db55718839b71016c25f2acd88c 100644
index 7b8c8a4993dc3cf454204121cefb42fd8ec435de..cbb77e090b6268407d43692a0f4ea521545c7585 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2108,7 +2108,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2112,7 +2112,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
public double @NotNull [] getTPS();

8
gale-api/paper-patches/features/0010-Last-tick-time-API.patch
View File

@@ -23,10 +23,10 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index d975042cdca36112c918b9617bd5ed335c47cd20..c3cdfd40386b0844712e9561b35e7acc6f83142b 100644
index d23700abf825d29832ee99d091faf693d4c381e9..4d0ec80ace15ab46e888a3f6e7452842bda8c60c 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -3028,6 +3028,20 @@ public final class Bukkit {
@@ -3032,6 +3032,20 @@ public final class Bukkit {
}
// Paper end - Folia region threading API
@@ -48,10 +48,10 @@ index d975042cdca36112c918b9617bd5ed335c47cd20..c3cdfd40386b0844712e9561b35e7acc
public static Server.Spigot spigot() {
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 5117891d90162db55718839b71016c25f2acd88c..1b075b1797e11785e6a463457678ab1033dc5399 100644
index cbb77e090b6268407d43692a0f4ea521545c7585..f7cbfdfca459f9b42ec6bd7ae1b412ce2757c2fe 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2706,4 +2706,29 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2710,4 +2710,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

4
gale-server/minecraft-patches/features/0062-Update-boss-bar-within-tick.patch
View File

@@ -13,7 +13,7 @@ As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric)
Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
diff --git a/net/minecraft/world/entity/raid/Raid.java b/net/minecraft/world/entity/raid/Raid.java
index 6e8c1a2863ac6e5137a26815ecf5142f0fcc9893..27234627933ccaa70b2c51a792efb2e68104a84f 100644
index 41b0db439b425b052bd1469daa6620a435ca852b..536c84362d3e74a5bf0e0494483da3c0e9b26f0b 100644
--- a/net/minecraft/world/entity/raid/Raid.java
+++ b/net/minecraft/world/entity/raid/Raid.java
@@ -109,6 +109,7 @@ public class Raid {
@@ -37,7 +37,7 @@ index 6e8c1a2863ac6e5137a26815ecf5142f0fcc9893..27234627933ccaa70b2c51a792efb2e6
if (!this.isStopped()) {
if (this.status == Raid.RaidStatus.ONGOING) {
boolean flag = this.active;
@@ -588,6 +595,12 @@ public class Raid {
@@ -581,6 +588,12 @@ public class Raid {
}
public void updateBossbar() {

4
gale-server/paper-patches/features/0004-Gale-configuration.patch
View File

@@ -144,7 +144,7 @@ index 05339a176083af667c16f77d76dc1878dafce3f0..9ca55cba185b9de566f911b08d671bee
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index d2de789967f8f1942e91d9e4c547113a5e31382b..9165b85bfafe404dddcc6634456e4df540bc0df9 100644
index d162c9c576686c1a2b2e6057f9800b1021c5c676..71d5313d0e57e3bc6a256d5384c3a79a8258ef24 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1087,6 +1087,7 @@ public final class CraftServer implements Server {
@@ -155,7 +155,7 @@ index d2de789967f8f1942e91d9e4c547113a5e31382b..9165b85bfafe404dddcc6634456e4df5
for (ServerLevel world : this.console.getAllLevels()) {
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
@@ -3055,6 +3056,14 @@ public final class CraftServer implements Server {
@@ -3045,6 +3046,14 @@ public final class CraftServer implements Server {
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}

4
gale-server/paper-patches/features/0015-Specific-interval-TPS-API.patch
View File

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 257b64aec23c6427c2512d2a21790e1cddc32520..193a01acc6b4b98fa8ac2e5b62ab2017d26158fa 100644
index 87f97df9a6ee2e00fc8e936cf0683cba3a76c4e3..ffdaeae687f343be06480fa2b026efd75df29a25 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3104,6 +3104,23 @@ public final class CraftServer implements Server {
@@ -3094,6 +3094,23 @@ public final class CraftServer implements Server {
};
}

4
gale-server/paper-patches/features/0016-5-second-TPS-average.patch
View File

@@ -58,10 +58,10 @@ index 12b327eea95e0de9e9c39b7d039badee8ec46508..6178f0212214a2a075cea60c758dca79
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 193a01acc6b4b98fa8ac2e5b62ab2017d26158fa..46b26e974913149426471c40d49e0b75c5c00823 100644
index ffdaeae687f343be06480fa2b026efd75df29a25..93b4847d674d8b33ff3ebe63a6d4fe0561e33d58 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3104,7 +3104,26 @@ public final class CraftServer implements Server {
@@ -3094,7 +3094,26 @@ public final class CraftServer implements Server {
};
}

4
gale-server/paper-patches/features/0017-Last-tick-time-API.patch
View File

@@ -23,10 +23,10 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 46b26e974913149426471c40d49e0b75c5c00823..5ad91693178b5645c98804ab04a56e85a28eb426 100644
index 93b4847d674d8b33ff3ebe63a6d4fe0561e33d58..c5e63626217ed730a2289a5f8e2074c9abfb7899 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3344,4 +3344,21 @@ public final class CraftServer implements Server {
@@ -3334,4 +3334,21 @@ public final class CraftServer implements Server {
this.console.addPluginAllowingSleep(plugin.getName(), value);
}
// Paper end - API to check if the server is sleeping

4
gradle.properties
View File

@@ -2,10 +2,10 @@ group=org.galemc.gale
version=1.21.4-R0.1-SNAPSHOT
mcVersion=1.21.4
paperRef=742968e078744a9d9fea35dc601cb6fecf05d889
paperRef=cafef9ce9bb73cbcb9bc9c59eb982ae2516f5ee6
org.gradle.configuration-cache=true
org.gradle.caching=true
org.gradle.parallel=true
org.gradle.vfs.watch=false
org.gradle.jvmargs = -Xmx4G
org.gradle.jvmargs = -Xmx4G