From da541455bd0b71ac2db30ea773d492904175a514 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Fri, 14 Jun 2024 01:01:51 +0800 Subject: [PATCH] Updated Upstream (Paper) --- gradle.properties | 2 +- .../server/0005-Gale-branding-changes.patch | 6 ++-- patches/server/0008-Gale-configuration.patch | 10 +++---- .../server/0017-Remove-vanilla-profiler.patch | 29 +++++++++---------- ...e-for-plugins-not-shutting-down-task.patch | 4 +-- .../0031-Cache-on-climbable-check.patch | 4 +-- ...t-log-legacy-Material-initialization.patch | 4 +-- .../0078-Reduce-array-allocations.patch | 8 ++--- ...chunks-to-activate-climbing-entities.patch | 4 +-- .../0117-CraftBukkit-UUID-to-world-map.patch | 16 +++++----- .../0119-Specific-interval-TPS-API.patch | 4 +-- .../server/0120-5-second-TPS-average.patch | 6 ++-- patches/server/0122-Last-tick-time-API.patch | 4 +-- .../0127-Optimize-matching-item-checks.patch | 6 ++-- 14 files changed, 53 insertions(+), 54 deletions(-) diff --git a/gradle.properties b/gradle.properties index 52a11d2..34c985f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=org.galemc.gale version=1.20.6-R0.1-SNAPSHOT mcVersion=1.20.6 -paperRef=bd5867a96f792f0eb32c1d249bb4bbc1d8338d14 +paperRef=79e2cb620ef03539390d97940824b38b707918f5 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0005-Gale-branding-changes.patch b/patches/server/0005-Gale-branding-changes.patch index 3748276..86465f0 100644 --- a/patches/server/0005-Gale-branding-changes.patch +++ b/patches/server/0005-Gale-branding-changes.patch @@ -464,7 +464,7 @@ index 790bad0494454ca12ee152e3de6da3da634d9b20..2596e0ee4df5b96f181e28a742ef3459 @Override diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 0ed42fa899721f83b598db05be1b5f321af3614a..4f54cd1f3ddd32834df0b12bd9c3028b6bc50f0a 100644 +index 3751c2a077bd13bac330b93c6efc2a640a17f4f2..edabecf0cdd5dca3cc40084f87f4af750ffe3507 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -956,7 +956,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop implements PreparableReloadListener { -@@ -9,14 +11,12 @@ public abstract class SimplePreparableReloadListener implements PreparableRel +@@ -9,14 +10,12 @@ public abstract class SimplePreparableReloadListener implements PreparableRel public final CompletableFuture reload( PreparableReloadListener.PreparationBarrier synchronizer, ResourceManager manager, @@ -1251,7 +1250,7 @@ index 7ef9f67d27cc240191dd5d07e8dcf5fbdebe1049..f60573a8c694f2efb5e8f2a4e6ae4dd8 } } else { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index ce01fe82dc1eaaf06ca317ddbc62b7d1b87a48b2..a2cc5b29ad5f9ac2d77f1596774224c2e9cc444c 100644 +index 21e61bb75ac7ce468bc757633ce678b21bcb9deb..d67a149de34619ac9945ba7fdbd4c7c8f33c8817 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -418,7 +418,6 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -1270,7 +1269,7 @@ index ce01fe82dc1eaaf06ca317ddbc62b7d1b87a48b2..a2cc5b29ad5f9ac2d77f1596774224c2 } public boolean canSpawnSoulSpeedParticle() { -@@ -3153,10 +3151,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3147,10 +3145,7 @@ public abstract class LivingEntity extends Entity implements Attackable { } this.run += (f3 - this.run) * 0.3F; @@ -1281,7 +1280,7 @@ index ce01fe82dc1eaaf06ca317ddbc62b7d1b87a48b2..a2cc5b29ad5f9ac2d77f1596774224c2 // Paper start - stop large pitch and yaw changes from crashing the server this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F; -@@ -3168,7 +3163,6 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3162,7 +3157,6 @@ public abstract class LivingEntity extends Entity implements Attackable { this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F; // Paper end @@ -1289,7 +1288,7 @@ index ce01fe82dc1eaaf06ca317ddbc62b7d1b87a48b2..a2cc5b29ad5f9ac2d77f1596774224c2 this.animStep += f2; if (this.isFallFlying()) { ++this.fallFlyTicks; -@@ -3391,19 +3385,14 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3385,19 +3379,14 @@ public abstract class LivingEntity extends Entity implements Attackable { } this.setDeltaMovement(d0, d1, d2); @@ -1309,7 +1308,7 @@ index ce01fe82dc1eaaf06ca317ddbc62b7d1b87a48b2..a2cc5b29ad5f9ac2d77f1596774224c2 if (this.jumping && this.isAffectedByFluids()) { double d3; -@@ -3430,8 +3419,6 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3424,8 +3413,6 @@ public abstract class LivingEntity extends Entity implements Attackable { this.noJumpDelay = 0; } @@ -1318,7 +1317,7 @@ index ce01fe82dc1eaaf06ca317ddbc62b7d1b87a48b2..a2cc5b29ad5f9ac2d77f1596774224c2 this.xxa *= 0.98F; this.zza *= 0.98F; this.updateFallFlying(); -@@ -3456,8 +3443,6 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3450,8 +3437,6 @@ public abstract class LivingEntity extends Entity implements Attackable { this.travel(vec3d1); } @@ -1327,7 +1326,7 @@ index ce01fe82dc1eaaf06ca317ddbc62b7d1b87a48b2..a2cc5b29ad5f9ac2d77f1596774224c2 if (!this.level().isClientSide && !this.isDeadOrDying() && !this.freezeLocked) { // Paper - Freeze Tick Lock API int i = this.getTicksFrozen(); -@@ -3474,15 +3459,12 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3468,15 +3453,12 @@ public abstract class LivingEntity extends Entity implements Attackable { this.hurt(this.damageSources().freeze(), 1.0F); } diff --git a/patches/server/0029-Print-stack-trace-for-plugins-not-shutting-down-task.patch b/patches/server/0029-Print-stack-trace-for-plugins-not-shutting-down-task.patch index 87f9579..3072c22 100644 --- a/patches/server/0029-Print-stack-trace-for-plugins-not-shutting-down-task.patch +++ b/patches/server/0029-Print-stack-trace-for-plugins-not-shutting-down-task.patch @@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c022f41153c84fb087b5a6eb7ae1df472f4186e6..e9c6087c2b6cae716384d28970eac3edad001d2a 100644 +index e4ab54277f7f21c41c07ce9b149431d96d794cd8..d1757b96dc4d27605ed1d0819c4b6246152ae1da 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1125,6 +1125,13 @@ public final class CraftServer implements Server { +@@ -1148,6 +1148,13 @@ public final class CraftServer implements Server { plugin.getPluginMeta().getDisplayName(), "This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies." )); diff --git a/patches/server/0031-Cache-on-climbable-check.patch b/patches/server/0031-Cache-on-climbable-check.patch index 41e15a1..64e5788 100644 --- a/patches/server/0031-Cache-on-climbable-check.patch +++ b/patches/server/0031-Cache-on-climbable-check.patch @@ -31,7 +31,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index a2cc5b29ad5f9ac2d77f1596774224c2e9cc444c..286f98a11b4f279adf4ce1c349b3a03c6c88ebcf 100644 +index d67a149de34619ac9945ba7fdbd4c7c8f33c8817..6c7a94fc951f6168c4a2907cc4d50b09c2913ab1 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -150,7 +150,6 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -42,7 +42,7 @@ index a2cc5b29ad5f9ac2d77f1596774224c2e9cc444c..286f98a11b4f279adf4ce1c349b3a03c public abstract class LivingEntity extends Entity implements Attackable { -@@ -2038,6 +2037,20 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -2032,6 +2031,20 @@ public abstract class LivingEntity extends Entity implements Attackable { return this.lastClimbablePos; } diff --git a/patches/server/0060-Do-not-log-legacy-Material-initialization.patch b/patches/server/0060-Do-not-log-legacy-Material-initialization.patch index 9d2f840..3a3bd67 100644 --- a/patches/server/0060-Do-not-log-legacy-Material-initialization.patch +++ b/patches/server/0060-Do-not-log-legacy-Material-initialization.patch @@ -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/craftbukkit/legacy/CraftLegacy.java b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java -index fde9aadd6c688b9797a6755f9d214918047598a0..0f47ee4193aa834e23b1c5bfc992881cd5872e8a 100644 +index 62f4835309df2b2deeb799609f9b1b325bf58af3..2885788f0ae37474dfab5f51908e290a5f972206 100644 --- a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java +++ b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java @@ -31,6 +31,7 @@ import org.bukkit.Material; @@ -48,7 +48,7 @@ index fde9aadd6c688b9797a6755f9d214918047598a0..0f47ee4193aa834e23b1c5bfc992881c /** * This class may seem unnecessarily slow and complicated/repetitive however it -@@ -256,7 +257,7 @@ public final class CraftLegacy { +@@ -265,7 +266,7 @@ public final class CraftLegacy { } static { diff --git a/patches/server/0078-Reduce-array-allocations.patch b/patches/server/0078-Reduce-array-allocations.patch index 81a3d41..91d6bce 100644 --- a/patches/server/0078-Reduce-array-allocations.patch +++ b/patches/server/0078-Reduce-array-allocations.patch @@ -624,10 +624,10 @@ index eb3c12e03c0d5c9cec84d97e2c51c50ce59c23a4..9b29ec4e72e4cdf2a42868ca5659fdcf private EquipmentSlot(final EquipmentSlot.Type type, final int entityId, final int armorStandId, final String name) { this.type = type; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 5961ca7c2665ee662c7cb00490b6e08a73e55263..0e3e414553837ac4a5a5e614134218d80af03004 100644 +index 6bf1f04224bcee2ae2809c11d8b950630a48dd36..b24198c1f1e2fe95546a649031f9a607ad57d12e 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3223,7 +3223,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3217,7 +3217,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @Nullable private Map collectEquipmentChanges() { Map map = null; @@ -690,10 +690,10 @@ index f38acc96f71298e40ce9433e7759fd223ca55e48..22ec9c1e74450f56cd1e390d59ca28f1 for (int j = 0; j < i; ++j) { diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 58c38bc4361ddf24716f326b0c6fc626d434756e..b6f7e5b5f853bb961283654200f648c769a71347 100644 +index f8589837070039b4911a9532b92fa959c7af6352..c7b3634c0565e7d750dca854414c94592ddc2b4e 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java -@@ -1104,7 +1104,7 @@ public final class ItemStack implements DataComponentHolder { +@@ -1111,7 +1111,7 @@ public final class ItemStack implements DataComponentHolder { ItemAttributeModifiers itemattributemodifiers = (ItemAttributeModifiers) this.getOrDefault(DataComponents.ATTRIBUTE_MODIFIERS, ItemAttributeModifiers.EMPTY); if (itemattributemodifiers.showInTooltip()) { diff --git a/patches/server/0111-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0111-Don-t-load-chunks-to-activate-climbing-entities.patch index 654c379..168c61b 100644 --- a/patches/server/0111-Don-t-load-chunks-to-activate-climbing-entities.patch +++ b/patches/server/0111-Don-t-load-chunks-to-activate-climbing-entities.patch @@ -28,10 +28,10 @@ index 02d03e0931d9e1b1f21cd8b6602a213d627dc122..1e9a42cfe203a6947201977165664194 return this.chunkPosition; } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 1f317bc15c4d37fc6c0c5a2ca99fd80d15aaf7f5..d214903e273709553d2e0276fdfa69556562fec4 100644 +index f2dafed01b2a54adb5f40f24a3c3366ec362eeff..302c7e14456413dddf5a4ab7efedcd8a737a475b 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2054,19 +2054,43 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -2048,19 +2048,43 @@ public abstract class LivingEntity extends Entity implements Attackable { public boolean onClimbableCached() { if (!this.blockPosition().equals(this.lastClimbingPosition)) { diff --git a/patches/server/0117-CraftBukkit-UUID-to-world-map.patch b/patches/server/0117-CraftBukkit-UUID-to-world-map.patch index 71dcab6..7141e8d 100644 --- a/patches/server/0117-CraftBukkit-UUID-to-world-map.patch +++ b/patches/server/0117-CraftBukkit-UUID-to-world-map.patch @@ -13,10 +13,10 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e9c6087c2b6cae716384d28970eac3edad001d2a..1ee326e8904f3a0e725b9dc4bc6e6decdb190b1b 100644 +index d1757b96dc4d27605ed1d0819c4b6246152ae1da..845e9e48c3d5c99a4e6c05d5486baafb5fc5e16c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -40,6 +40,9 @@ import java.util.logging.Logger; +@@ -41,6 +41,9 @@ import java.util.logging.Logger; import java.util.stream.Collectors; import javax.imageio.ImageIO; // import jline.console.ConsoleReader; @@ -26,7 +26,7 @@ index e9c6087c2b6cae716384d28970eac3edad001d2a..1ee326e8904f3a0e725b9dc4bc6e6dec import net.minecraft.advancements.AdvancementHolder; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; -@@ -279,6 +282,7 @@ public final class CraftServer implements Server { +@@ -280,6 +283,7 @@ public final class CraftServer implements Server { protected final DedicatedServer console; protected final DedicatedPlayerList playerList; private final Map worlds = new LinkedHashMap(); @@ -34,15 +34,15 @@ index e9c6087c2b6cae716384d28970eac3edad001d2a..1ee326e8904f3a0e725b9dc4bc6e6dec // private final Map, Registry> registries = new HashMap<>(); // Paper - replace with RegistryAccess private YamlConfiguration configuration; private YamlConfiguration commandsConfiguration; -@@ -1451,6 +1455,7 @@ public final class CraftServer implements Server { +@@ -1474,6 +1478,7 @@ public final class CraftServer implements Server { this.getLogger().log(Level.SEVERE, null, ex); } + this.worldsByUUID.remove(world.getUID()); // Gale - MultiPaper - CraftBukkit UUID to world map - this.worlds.remove(world.getName().toLowerCase(java.util.Locale.ENGLISH)); + this.worlds.remove(world.getName().toLowerCase(Locale.ROOT)); this.console.removeLevel(handle); return true; -@@ -1469,12 +1474,7 @@ public final class CraftServer implements Server { +@@ -1492,12 +1497,7 @@ public final class CraftServer implements Server { @Override public World getWorld(UUID uid) { @@ -56,11 +56,11 @@ index e9c6087c2b6cae716384d28970eac3edad001d2a..1ee326e8904f3a0e725b9dc4bc6e6dec } // Paper start -@@ -1492,6 +1492,7 @@ public final class CraftServer implements Server { +@@ -1515,6 +1515,7 @@ public final class CraftServer implements Server { System.out.println("World " + world.getName() + " is a duplicate of another world and has been prevented from loading. Please delete the uid.dat file from " + world.getName() + "'s world directory if you want to be able to load the duplicate world."); return; } + this.worldsByUUID.put(world.getUID(), world); // Gale - MultiPaper - CraftBukkit UUID to world map - this.worlds.put(world.getName().toLowerCase(java.util.Locale.ENGLISH), world); + this.worlds.put(world.getName().toLowerCase(Locale.ROOT), world); } diff --git a/patches/server/0119-Specific-interval-TPS-API.patch b/patches/server/0119-Specific-interval-TPS-API.patch index bbd86d6..f1a2b47 100644 --- a/patches/server/0119-Specific-interval-TPS-API.patch +++ b/patches/server/0119-Specific-interval-TPS-API.patch @@ -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 1ee326e8904f3a0e725b9dc4bc6e6decdb190b1b..b95a138d76c19be285a1b9b0a096027650dd67aa 100644 +index 845e9e48c3d5c99a4e6c05d5486baafb5fc5e16c..4213c71f2f2edd88583b5620145d55e670080c4d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -3082,6 +3082,24 @@ public final class CraftServer implements Server { +@@ -3105,6 +3105,24 @@ public final class CraftServer implements Server { }; } diff --git a/patches/server/0120-5-second-TPS-average.patch b/patches/server/0120-5-second-TPS-average.patch index 9c2c84f..ac28b2c 100644 --- a/patches/server/0120-5-second-TPS-average.patch +++ b/patches/server/0120-5-second-TPS-average.patch @@ -59,7 +59,7 @@ index 039a86034928a5eb7aaa2d7ca76a7bddcca346bd..7c32c60100cf2bd109eb8762efa856c1 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d5113b3650ec45127246b18e1f64526bff1798e4..55ea6cd231128b7c2781e59a4fe51a021ab35bb8 100644 +index 83e8cca6181129a48a83bd1630b8ffa8aa96d7cc..be2d97e1b28a45d0dff0b528559a075078ab9bf2 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1062,6 +1062,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop