Updated Upstream (Gale)

gradle.properties

@@ -1,7 +1,7 @@
 group = org.dreeam.leaf
 version = 1.19.3-R0.1-SNAPSHOT
 
-GaleCommit = a455701b06f429147d8e178b5d2b6bca6c65508f
+GaleCommit = 9eec5eae111108ca5cd2ad7bfb562a11a15353b9
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0008-KeYi-Add-Java19-Support-for-SIMD.patch

@@ -7,19 +7,20 @@ Original license: MIT
 Original project: https://github.com/KeYiMC/KeYi
 
 diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
-index d51f9de6ac01f518ca9577827dc719daad78df4c..cfab520664df368cabcfbd925414d227cd352b57 100644
+index 48312d416805697257e4cd3451b8d14bab7ea252..cfab520664df368cabcfbd925414d227cd352b57 100644
 --- a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
 +++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
-@@ -17,7 +17,7 @@ public class SIMDChecker {
+@@ -17,8 +17,7 @@ public class SIMDChecker {
      @Deprecated
      public static boolean canEnable(Logger logger, boolean logVectorSizesToConsole) {
          try {
--            if (SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18) {
+-            int javaVersion = SIMDDetection.getJavaVersion();
+-            if (!(javaVersion >= 17 && javaVersion <= 19)) {
 +            if (SIMDDetection.getJavaVersion() < 17) { // KeYi - Add Java19 Support for SIMD
                  return false;
              } else {
                  SIMDDetection.testRun = true;
-@@ -40,5 +40,4 @@ public class SIMDChecker {
+@@ -41,5 +40,4 @@ public class SIMDChecker {
          } catch (NoClassDefFoundError | Exception ignored) {} // Basically, we don't do anything. This lets us detect if it's not functional and disable it.
          return false;
      }

patches/server/0004-Remove-Mojang-username-check.patch

@@ -5,18 +5,18 @@ Subject: [PATCH] Remove Mojang username check
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 2ed3f42b1e487374287d033ac634a922a5ef37bd..85003e1a7e7b1e6519441a543c6e5357a467dc99 100644
+index af96c170c58553f4ce0554c9bd24fea2ad96ed01..cefd1bcf16368c93462e7734d7195c3dffe5f59a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -37,6 +37,7 @@ import net.minecraft.util.Crypt;
+@@ -38,6 +38,7 @@ import net.minecraft.util.CryptException;
- import net.minecraft.util.CryptException;
  import net.minecraft.util.RandomSource;
  import org.apache.commons.lang3.Validate;
+ import org.galemc.gale.configuration.GaleGlobalConfiguration;
 +import org.dreeam.leaf.LeafConfig;
  import org.slf4j.Logger;
  
  // CraftBukkit start
-@@ -239,7 +240,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -243,7 +244,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
      public void handleHello(ServerboundHelloPacket packet) {
          // Gale start - JettPack - reduce array allocations
          Validate.validState(this.state == ServerLoginPacketListenerImpl.State.HELLO, "Unexpected hello packet", ArrayConstants.emptyObjectArray);

patches/server/0007-Remove-UseItemOnPacket-Too-Far-Check.patch

@@ -7,14 +7,10 @@ This Check is added in 1.17.x -> 1.18.x update by Mojang.
 By removing this check, it enable hackers to use some modules of hack clients.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 99e684ae2f5ac07660e4f724b15cf1bba185d438..76adc3aeaf4de9307668803b01f39da7cb828da1 100644
+index deadeb7a98e5b64d7b9fae3a9e7858a4cd1d39e2..7643f8a3aa22c8d58ce74a18efe3d98f5017d04c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -184,10 +184,10 @@ import net.minecraft.world.phys.Vec3;
+@@ -189,6 +189,7 @@ import org.apache.commons.lang3.StringUtils;
- import net.minecraft.world.phys.shapes.BooleanOp;
- import net.minecraft.world.phys.shapes.Shapes;
- import net.minecraft.world.phys.shapes.VoxelShape;
--import org.apache.commons.lang3.StringUtils;
  import org.galemc.gale.configuration.GaleGlobalConfiguration;
  import org.galemc.gale.executor.queue.BaseTaskQueues;
  import org.galemc.gale.executor.queue.ScheduledServerThreadTaskQueues;
@@ -22,7 +18,7 @@ index 99e684ae2f5ac07660e4f724b15cf1bba185d438..76adc3aeaf4de9307668803b01f39da7
  import org.slf4j.Logger;
  
  // CraftBukkit start
-@@ -1967,7 +1967,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1980,7 +1981,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  Vec3 vec3d2 = vec3d.subtract(vec3d1);
                  double d0 = 1.0000001D;
  

patches/server/0008-Purpur-Implement-TPSBar.patch

@@ -98,7 +98,7 @@ index 290f0e317b75358a14c7c58e9d6e8e7340fd0721..0e7fae39da20478a2b0ff9ba5430d54f
          }
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6ed357bff6cafce563774ca2f5e2944bcdfb7f92..9d3d1714717bf2a301662473416fd5eaa9027266 100644
+index e6c2eff84ac596825a11574cf89956e70a344562..66082298aea31d17c8e9a85e3cca1951b2d53f87 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -269,6 +269,7 @@ public class ServerPlayer extends Player {
@@ -125,7 +125,7 @@ index 6ed357bff6cafce563774ca2f5e2944bcdfb7f92..9d3d1714717bf2a301662473416fd5ea
      }
  
      // CraftBukkit start - World fallback code, either respawn location or global spawn
-@@ -2545,4 +2548,14 @@ public class ServerPlayer extends Player {
+@@ -2551,4 +2554,14 @@ public class ServerPlayer extends Player {
          return (CraftPlayer) super.getBukkitEntity();
      }
      // CraftBukkit end
@@ -141,7 +141,7 @@ index 6ed357bff6cafce563774ca2f5e2944bcdfb7f92..9d3d1714717bf2a301662473416fd5ea
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 636a5afca868b05f7dbb4da8a7e04b968ada5048..50525c63ee801585ca7b8e1f3a49a3cdf7c81ff3 100644
+index fe87ef6e0540bf81518fa01ca2c3516c95c2fb53..3bff74a3eef63debf61f76cc859e157f8ca59d7a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -105,6 +105,7 @@ import net.minecraft.world.scores.Scoreboard; // Paper
@@ -152,15 +152,15 @@ index 636a5afca868b05f7dbb4da8a7e04b968ada5048..50525c63ee801585ca7b8e1f3a49a3cd
  import org.slf4j.Logger;
  
  // CraftBukkit start
-@@ -508,6 +509,7 @@ public abstract class PlayerList {
+@@ -515,6 +516,7 @@ public abstract class PlayerList {
              scoreboard.addPlayerToTeam(player.getScoreboardName(), collideRuleTeam);
          }
          // Paper end
 +        BossBarTask.addToAll(player); // Purpur
          // CraftBukkit - Moved from above, added world
+         if (GaleGlobalConfiguration.get().logToConsole.playerLoginLocations) { // Gale - JettPack - make logging login location configurable
          PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", player.getName().getString(), s1, player.getId(), worldserver1.serverLevelData.getLevelName(), player.getX(), player.getY(), player.getZ());
-     }
+@@ -630,6 +632,8 @@ public abstract class PlayerList {
-@@ -617,6 +619,8 @@ public abstract class PlayerList {
      }
      public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer, net.kyori.adventure.text.Component leaveMessage) {
          // Paper end

patches/server/0009-Purpur-Add-compass-command.patch

@@ -19,7 +19,7 @@ index 0e8700ccc884957f08fa382723a3784d94da0f0e..66242833210ae89cbca7448cd4e7cf1f
  
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9d3d1714717bf2a301662473416fd5eaa9027266..f04ca69de983d5d6dc5df62c16d1f5caffae43ab 100644
+index 66082298aea31d17c8e9a85e3cca1951b2d53f87..d1fd3eb9e51ace68d3ffc24579cdf95ebdaea039 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -270,6 +270,7 @@ public class ServerPlayer extends Player {
@@ -46,7 +46,7 @@ index 9d3d1714717bf2a301662473416fd5eaa9027266..f04ca69de983d5d6dc5df62c16d1f5ca
      }
  
      // CraftBukkit start - World fallback code, either respawn location or global spawn
-@@ -2557,5 +2560,13 @@ public class ServerPlayer extends Player {
+@@ -2563,5 +2566,13 @@ public class ServerPlayer extends Player {
      public void tpsBar(boolean tpsBar) {
          this.tpsBar = tpsBar;
      }

patches/server/0010-Purpur-Implement-ram-and-rambar-commands.patch

@@ -20,7 +20,7 @@ index 66242833210ae89cbca7448cd4e7cf1fa774bcf0..ff19fcd83295c6936dd83c7780d57570
  
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f04ca69de983d5d6dc5df62c16d1f5caffae43ab..f262a9c0d48eaeaf463fde03992c65ca03a8a0c6 100644
+index d1fd3eb9e51ace68d3ffc24579cdf95ebdaea039..1b92480529c4436efe3d3b293a7af1fa95457a9d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -271,6 +271,7 @@ public class ServerPlayer extends Player {
@@ -47,7 +47,7 @@ index f04ca69de983d5d6dc5df62c16d1f5caffae43ab..f262a9c0d48eaeaf463fde03992c65ca
          nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
          nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur
      }
-@@ -2568,5 +2571,14 @@ public class ServerPlayer extends Player {
+@@ -2574,5 +2577,14 @@ public class ServerPlayer extends Player {
      public void compassBar(boolean compassBar) {
          this.compassBar = compassBar;
      }

patches/server/0016-Purpur-Configurable-broadcast-settings.patch

@@ -19,7 +19,7 @@ index 5ba0a756d45350dcda3caa5518c9a47a4de06f14..e438597242adc99e88f465231a043ea2
                      // Paper end
                  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f262a9c0d48eaeaf463fde03992c65ca03a8a0c6..bde648a57d3fad82d58c47d6980782a1943e45c4 100644
+index 1b92480529c4436efe3d3b293a7af1fa95457a9d..2c2262a2babd4fd5ca22b4630c1f0ae5e3a1a9ab 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -948,6 +948,7 @@ public class ServerPlayer extends Player {
@@ -58,10 +58,10 @@ index f262a9c0d48eaeaf463fde03992c65ca03a8a0c6..bde648a57d3fad82d58c47d6980782a1
      public void displayClientMessage(Component message, boolean overlay) {
          this.sendSystemMessage(message, overlay);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 50525c63ee801585ca7b8e1f3a49a3cdf7c81ff3..ffef75ebae92efe6a301d4cbae95d92204831240 100644
+index 2a678c1140bbd6d9d608e9633cac6bb31613a380..bfa183cc584c018005d57a64f2860686f1a5e538 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1112,6 +1112,20 @@ public abstract class PlayerList {
+@@ -1125,6 +1125,20 @@ public abstract class PlayerList {
      }
      // CraftBukkit end
  
@@ -103,10 +103,10 @@ index 2848cb7c76e94d8349f042dc92daf01322a6ce5a..0edf0e24b0b311269b447a34f3aad485
          return this.isFireSource;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5f1cea3088cb48804c46d7aadf347a8481470933..aa27504ab1e2d98a647c3916a06aa38b1b4e6357 100644
+index 5133905fbde6c507983554830413738dae09a269..1b6cbf4382324f5c8058b48527f7e9b4a3272036 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3860,6 +3860,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3877,6 +3877,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return SlotAccess.NULL;
      }
  

patches/server/0017-Purpur-Allow-player-join-full-server-by-permission.patch

@@ -7,10 +7,10 @@ Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ffef75ebae92efe6a301d4cbae95d92204831240..f1ab52e62c93c8f358f9c8d4c2304f4e68d92e31 100644
+index 75c85f04010870fda2f8b71fc8256c0071f46d31..8ee0702d6d57387d74dde2d8165eb9040a58fc76 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -775,7 +775,7 @@ public abstract class PlayerList {
+@@ -788,7 +788,7 @@ public abstract class PlayerList {
              event.disallow(PlayerLoginEvent.Result.KICK_BANNED, PaperAdventure.asAdventure(ichatmutablecomponent)); // Paper - Adventure
          } else {
              // return this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameprofile) ? IChatBaseComponent.translatable("multiplayer.disconnect.server_full") : null;

patches/server/0020-Purpur-Add-more-logger-output-for-invalid-movement-k.patch

@@ -7,10 +7,10 @@ Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 76adc3aeaf4de9307668803b01f39da7cb828da1..c6668f9c2fc77265b06117fde93bbe6e7687d953 100644
+index 7643f8a3aa22c8d58ce74a18efe3d98f5017d04c..e7bea7ebffd78813282b42d8ba5f219c10cc8959 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -829,6 +829,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -838,6 +838,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          if (packet.getId() == this.awaitingTeleport) {
              if (this.awaitingPositionFromClient == null) {
                  this.disconnect(Component.translatable("multiplayer.disconnect.invalid_player_movement"), org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PLAYER_MOVEMENT); // Paper - kick event cause
@@ -18,7 +18,7 @@ index 76adc3aeaf4de9307668803b01f39da7cb828da1..c6668f9c2fc77265b06117fde93bbe6e
                  return;
              }
  
-@@ -1388,8 +1389,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1402,8 +1403,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      @Override
      public void handleMovePlayer(ServerboundMovePlayerPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());

patches/server/0022-Purpur-Lobotomize-stuck-villagers.patch

@@ -7,10 +7,10 @@ Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index a4029cd16d964cd3a58f9f6e8471fbdf07de578b..f3e07732776b37c031069bf223ac62e89c97d2e0 100644
+index 7740adf7e852d860d08cdf15ab9d6b0fb6b68055..df301983ef9fd0f2dbd6ec30529e41f344272bd3 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -139,6 +139,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -141,6 +141,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
      }, MemoryModuleType.MEETING_POINT, (entityvillager, holder) -> {
          return holder.is(PoiTypes.MEETING);
      });
@@ -19,7 +19,7 @@ index a4029cd16d964cd3a58f9f6e8471fbdf07de578b..f3e07732776b37c031069bf223ac62e8
  
      public Villager(EntityType<? extends Villager> entityType, Level world) {
          this(entityType, world, VillagerType.PLAINS);
-@@ -153,6 +155,47 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -155,6 +157,47 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          this.setVillagerData(this.getVillagerData().setType(type).setProfession(VillagerProfession.NONE));
      }
  
@@ -67,7 +67,7 @@ index a4029cd16d964cd3a58f9f6e8471fbdf07de578b..f3e07732776b37c031069bf223ac62e8
      @Override
      public Brain<Villager> getBrain() {
          return (Brain<Villager>) super.getBrain(); // CraftBukkit - decompile error
-@@ -247,6 +290,21 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -249,6 +292,21 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
      protected void customServerAiStep() { mobTick(false); }
      protected void mobTick(boolean inactive) {
          if (!inactive) this.getBrain().tick((ServerLevel) this.level, this); // Paper

patches/server/0023-Purpur-Option-to-disable-kick-for-out-of-order-chat.patch

@@ -7,10 +7,10 @@ Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c6668f9c2fc77265b06117fde93bbe6e7687d953..68248b1156a592edc662b60e5f5cdfcfd1aff2e0 100644
+index e7bea7ebffd78813282b42d8ba5f219c10cc8959..5ce73d5b8a5885664f1e21743b8b31f842c0524c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2385,7 +2385,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2406,7 +2406,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          do {
              instant1 = (Instant) this.lastChatTimeStamp.get();
              if (timestamp.isBefore(instant1)) {

patches/server/0024-KeYi-Do-not-save-firework-entities-or-the-server-may.patch

@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: nostalgic853 <yuu8583@proton.me>
-Date: Mon, 24 Oct 2022 10:25:40 +0800
-Subject: [PATCH] KeYi: Do not save firework entities or the server may be
- laggy
-
-Original license: MIT
-Original project: https://github.com/KeYiMC/KeYi
-
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java b/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
-index 5406925cd66f46ab8744123c670d72cea7bfc3a1..0b664dfef68b1e3905c9d8451602abf9cd9eafe6 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
-@@ -358,4 +358,11 @@ public class FireworkRocketEntity extends Projectile implements ItemSupplier {
-     public boolean isAttackable() {
-         return false;
-     }
-+
-+    // KeYi start
-+    @Override
-+    public boolean shouldBeSaved() {
-+        return false;
-+    }
-+    // KeYi end
- }