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

Updated Upstream (Paper/Gale)

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

Paper Changes:
PaperMC/Paper@b5066268 Remove unused light queue size option (#12201)
PaperMC/Paper@1d5e5a57 Document replacement for Skull owner profile methods (#12195)
PaperMC/Paper@8de7e356 Add null check to level ref in Entity constructor (#12218)
PaperMC/Paper@a866e366 Fix MenuType.SMITHING JavaDocs (#12226)
PaperMC/Paper@5538d24d Fix "DEFAULT" SpawnReason of fish spawned by bucket (#12227)
PaperMC/Paper@0a4eb8f3 Send the pong response packet immediately. This packet is similar to the keep alive packet and is processed async. (#12242)
PaperMC/Paper@7a3d0c4e Fix recipe being always null in PrepareItemCraftEvent from the api (#12237)
PaperMC/Paper@a6ce734f Fix zombie villager not dropping item once cured (#12230)
PaperMC/Paper@ce300162 Skip alpha channel for custom model data component (#12205)

Gale Changes:
Dreeam-qwq/Gale@ef499e4c Updated Upstream (Paper)
This commit is contained in:
Dreeam
2025-03-08 01:31:44 -05:00
parent e38a717f8a
commit 8c1ad8d658
8 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group=cn.dreeam.leaf
mcVersion=1.21.4
version=1.21.4-R0.1-SNAPSHOT
galeCommit=d56fa60e7924c021feb0c82b4cb61f44ae6c2c7d
galeCommit=ef499e4c3fdceca36614cc4cdbd970d522a76629
org.gradle.configuration-cache=true
org.gradle.caching=true

18
leaf-server/minecraft-patches/features/0007-Purpur-Server-Minecraft-Changes.patch
View File

@@ -267,7 +267,7 @@ index fe4ae6bcdcbb55c47e9f9a4d63ead4c39e6d63cf..ec0998369158286fccb38c8e10c3cfa2
public boolean isLocalPlayer() {
return true;
diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java
index e1000d8ab5ae0034b56a3524d2caee8c299b50e7..7b78c0af4a83bd39a5bc2d6554cc677bd4c0c822 100644
index 4ed9611994c5c8da01fede690197527c5b3a5731..00a82873d226f113278632a53c0faca420dd67d4 100644
--- a/net/minecraft/network/Connection.java
+++ b/net/minecraft/network/Connection.java
@@ -588,11 +588,20 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -1883,7 +1883,7 @@ index 1fc9e1ad541c46124183a401b2a7d99aea69cecf..881271f0bc77a8a8a7d31daad9a8188b
}
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
index c2a2892d34497a616951f4689ab6126191d9f655..f83a90cba0229842389740199a8d7f12fe44b0d9 100644
index 63f94b2fdf1e8395d3e76aebd4466c916c73dc59..a5a8bdecddadac3de1b5a0c1a9849ce1cd52a530 100644
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -134,7 +134,7 @@ import net.minecraft.world.scores.Team;
@@ -2643,7 +2643,7 @@ index 696ef08b2d897c91a20bc22987b1f5c7047615be..ac006d8738592bc5cb77033adc8c442c
return slot != EquipmentSlot.HEAD && slot != EquipmentSlot.MAINHAND && slot != EquipmentSlot.OFFHAND
? SlotAccess.forEquipmentSlot(entity, slot, stack -> stack.isEmpty() || entity.getEquipmentSlotForItem(stack) == slot)
diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
index b66e4061d5248961f385691d0db95fb8a22f888f..7b8804844ab5636323bc8d136c775f1e9591e89c 100644
index 4b4fa6674916d227500ce03823477a3958729190..fbcb803fb575cb1f81afa9d03d5fddbf6352155d 100644
--- a/net/minecraft/world/entity/Mob.java
+++ b/net/minecraft/world/entity/Mob.java
@@ -143,13 +143,14 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -2730,7 +2730,7 @@ index b66e4061d5248961f385691d0db95fb8a22f888f..7b8804844ab5636323bc8d136c775f1e
Vec3i pickupReach = this.getPickupReach();
for (ItemEntity itemEntity : this.level()
@@ -1255,7 +1284,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -1257,7 +1286,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
);
}
@@ -2739,7 +2739,7 @@ index b66e4061d5248961f385691d0db95fb8a22f888f..7b8804844ab5636323bc8d136c775f1e
return spawnGroupData;
}
@@ -1352,7 +1381,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -1354,7 +1383,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
}
protected InteractionResult mobInteract(Player player, InteractionHand hand) {
@@ -2748,7 +2748,7 @@ index b66e4061d5248961f385691d0db95fb8a22f888f..7b8804844ab5636323bc8d136c775f1e
}
public boolean isWithinRestriction() {
@@ -1594,6 +1623,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -1596,6 +1625,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
this.playAttackSound();
}
@@ -2756,7 +2756,7 @@ index b66e4061d5248961f385691d0db95fb8a22f888f..7b8804844ab5636323bc8d136c775f1e
return flag;
}
@@ -1606,26 +1636,8 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -1608,26 +1638,8 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
// Gale end - JettPack - optimize sun burn tick - cache eye blockpos
public boolean isSunBurnTick() {
@@ -2785,7 +2785,7 @@ index b66e4061d5248961f385691d0db95fb8a22f888f..7b8804844ab5636323bc8d136c775f1e
}
@Override
@@ -1681,4 +1693,58 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -1683,4 +1695,58 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
public float[] getArmorDropChances() {
return this.armorDropChances;
}
@@ -11670,7 +11670,7 @@ index cf231380febd6d316eb902d43c636135ee0d7fa4..7af71c777dca26cd94b1807a2a77ea0d
@Override
diff --git a/net/minecraft/world/entity/monster/ZombieVillager.java b/net/minecraft/world/entity/monster/ZombieVillager.java
index 9061e0b6544d6a31a4dc5b51037f608031a00553..1ca0514732916d325c4a76d73120aaf613c3f780 100644
index 8403257d81367c7371fa94d458a59a4589dc0bd7..aa5c02b5c949c80a96c1dd60fd3de8e2261fe797 100644
--- a/net/minecraft/world/entity/monster/ZombieVillager.java
+++ b/net/minecraft/world/entity/monster/ZombieVillager.java
@@ -78,6 +78,66 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {

10
leaf-server/minecraft-patches/features/0008-Fix-Pufferfish-and-Purpur-patches.patch
View File

@@ -78,7 +78,7 @@ index 72cdd8f72fb3f552d9729f21de438405abe3acdb..90a8494840faa0e7f605c904c657a953
// Gale end - MultiPaper - skip unnecessary mob spawning computations
int _int = this.level.getGameRules().getInt(GameRules.RULE_RANDOMTICKING);
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index c0be2543ab55fda85302812a4773e551f64cf7d9..ffe2f8577ec42c9f071d72a191e8fefc6ba67f0e 100644
index f869deca50e463f34a003be473c7bfbe51b297ec..0c080481190262c61450e439350720bb1ed8f5f5 100644
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1232,7 +1232,7 @@ public class ServerGamePacketListenerImpl
@@ -91,7 +91,7 @@ index c0be2543ab55fda85302812a4773e551f64cf7d9..ffe2f8577ec42c9f071d72a191e8fefc
this.disconnectAsync(Component.literal("Book too large!"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION); // Paper - kick event cause // Paper - add proper async disconnect
return;
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
index f83a90cba0229842389740199a8d7f12fe44b0d9..b775996b6dbc09c95c83a542da12dee7bf65bf4c 100644
index a5a8bdecddadac3de1b5a0c1a9849ce1cd52a530..f500f4e32e676712fcd0c877498acc2722baae98 100644
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -533,23 +533,37 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -142,7 +142,7 @@ index f83a90cba0229842389740199a8d7f12fe44b0d9..b775996b6dbc09c95c83a542da12dee7
public Entity(EntityType<?> entityType, Level level) {
this.type = entityType;
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
index 7a07789f115cb4a8917097e0697e80184104817e..c9870c7ce29e240d60b5b29bdf4deba85023be60 100644
index ac006d8738592bc5cb77033adc8c442ce302a476..ce2a9b6c4b903e5285e77f7ee64defd8e81029ae 100644
--- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java
@@ -1024,13 +1024,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -164,10 +164,10 @@ index 7a07789f115cb4a8917097e0697e80184104817e..c9870c7ce29e240d60b5b29bdf4deba8
}
// Purpur end - Mob head visibility percent
diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
index 7b8804844ab5636323bc8d136c775f1e9591e89c..14d9dceacc82cc6c085dab8f52e59a318dd8cae5 100644
index fbcb803fb575cb1f81afa9d03d5fddbf6352155d..b326c87c1c958bb18fc961010768f7d9f0e414cf 100644
--- a/net/minecraft/world/entity/Mob.java
+++ b/net/minecraft/world/entity/Mob.java
@@ -1630,11 +1630,6 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -1632,11 +1632,6 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
protected void playAttackSound() {
}

4
leaf-server/minecraft-patches/features/0075-Fix-MC-200418.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Fix-MC-200418
Related MC issue: https://bugs.mojang.com/browse/MC-200418
diff --git a/net/minecraft/world/entity/monster/ZombieVillager.java b/net/minecraft/world/entity/monster/ZombieVillager.java
index 970f6bdb0d0c15f7d814926472daec689beb82f4..13bcfaa0dd78a72544859dc1a27734e9132a92ae 100644
index cb0e000c5b8636296c7d7474d0947c75f41b6058..d4b6c93f9f0e109be300164c4fd9167aba2d951c 100644
--- a/net/minecraft/world/entity/monster/ZombieVillager.java
+++ b/net/minecraft/world/entity/monster/ZombieVillager.java
@@ -321,6 +321,12 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
@@ -320,6 +320,12 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
if (!this.isSilent()) {
serverLevel.levelEvent(null, 1027, this.blockPosition(), 0);
}

4
leaf-server/minecraft-patches/features/0104-Lithium-equipment-tracking.patch
View File

@@ -218,7 +218,7 @@ index 0138bd4d95a592bfa5ccbb33fa6c1201f289fd2a..00233a7066d751821566b43993e8c45e
}
}
diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
index c32086ddf90fafcc55600f9e0724b9f915671482..b541236c39e3f36bcc619fffe83e32987df20adf 100644
index faf05f0c8f273bc723bbe54c70aebdd26c479a6b..54eeb0b112112bc5d3f4165c0ea43cf67931a739 100644
--- a/net/minecraft/world/entity/Mob.java
+++ b/net/minecraft/world/entity/Mob.java
@@ -94,7 +94,7 @@ import org.bukkit.event.entity.EntityUnleashEvent;
@@ -276,7 +276,7 @@ index c32086ddf90fafcc55600f9e0724b9f915671482..b541236c39e3f36bcc619fffe83e3298
}
@Override
@@ -1748,4 +1762,10 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -1750,4 +1764,10 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
}
}
// Purpur end - Ridables

8
leaf-server/paper-patches/features/0005-Purpur-Server-Paper-Changes.patch
View File

@@ -282,7 +282,7 @@ index 352d62385e56d5805510596ec9424e5d14336861..b4d4ad2dc7d719d72c0786791f803fbc
final ConfigurationTransformation.VersionedBuilder versionedBuilder = Transformations.versionedBuilder();
diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
index d193330bfd97767705c878e359969378d43b99d0..4bc6a6572f18b333a3c48b2a96f3079998e7d77f 100644
index 84a5adb3631042dc1a5595c365ca6532fe26e293..7bfa7aa30c1181587c7632f920f48348d2493ea4 100644
--- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
@@ -401,6 +401,7 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -558,7 +558,7 @@ index 94ca0407303c4493ab4928b12ec6ecc75aaca549..f2d87c12dd19210ce7e2147fada5c101
+ // Purpur end - OfflinePlayer API
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 93f115da494a66a756961b0cc16dea11010ea54f..feb39ef98af539f0c97cdd2bada7bb8febfb4de8 100644
index 5ee4209b8d9cb1fee13b950c17cc05920c2b82b7..46faa577dd7edc915ffee7d5730470501e56cc6c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -429,6 +429,20 @@ public final class CraftServer implements Server {
@@ -667,7 +667,7 @@ index 93f115da494a66a756961b0cc16dea11010ea54f..feb39ef98af539f0c97cdd2bada7bb8f
@Override
public List<Recipe> getRecipesFor(ItemStack result) {
Preconditions.checkArgument(result != null, "ItemStack cannot be null");
@@ -3066,6 +3137,18 @@ public final class CraftServer implements Server {
@@ -3067,6 +3138,18 @@ public final class CraftServer implements Server {
}
// Gale end - Gale configuration - API
@@ -686,7 +686,7 @@ index 93f115da494a66a756961b0cc16dea11010ea54f..feb39ef98af539f0c97cdd2bada7bb8f
@Override
public void restart() {
CraftServer.this.restart();
@@ -3363,4 +3446,18 @@ public final class CraftServer implements Server {
@@ -3364,4 +3447,18 @@ public final class CraftServer implements Server {
return MinecraftServer.lastTickOversleepTime;
}
// Gale end - YAPFA - last tick time - API

4
leaf-server/paper-patches/features/0011-Leaves-Replay-Mod-API.patch
View File

@@ -27,7 +27,7 @@ index 4c003acccdd2dd17918b15316001e52e7670123e..780f3a48152fef6a06dc67bf7fbd1965
HandlerList handlers = event.getHandlers();
RegisteredListener[] listeners = handlers.getRegisteredListeners();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 989008d7c33813bda72464690690bdf78946eac3..144e876399dd61396ae5d192182b3be87ec84da0 100644
index c1eab51bddb8101a05f394721a9842f59cd470ab..be250ddfa006d452d77f17b4cd97a487c95a5691 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -322,6 +322,8 @@ public final class CraftServer implements Server {
@@ -48,7 +48,7 @@ index 989008d7c33813bda72464690690bdf78946eac3..144e876399dd61396ae5d192182b3be8
@Override
public CraftPlayer apply(ServerPlayer player) {
return player.getBukkitEntity();
@@ -3460,4 +3462,11 @@ public final class CraftServer implements Server {
@@ -3461,4 +3463,11 @@ public final class CraftServer implements Server {
return getServer().lagging;
}
// Purpur end - Lagging threshold

4
leaf-server/paper-patches/features/0015-Including-5s-in-getTPS.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Including 5s in getTPS()
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 144e876399dd61396ae5d192182b3be87ec84da0..230e645e215103b6c09fc09e3653e76879a27727 100644
index be250ddfa006d452d77f17b4cd97a487c95a5691..179a99e8ed2aced0306ec76849238c69f9601451 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3184,6 +3184,8 @@ public final class CraftServer implements Server {
@@ -3185,6 +3185,8 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {