Updated Upstream (Pufferfish)

gradle.properties

@@ -6,4 +6,4 @@ org.gradle.jvmargs = -Xmx4G
 group=dev.etil.mirai
 version=1.20.2-R0.1-SNAPSHOT
 mcVersion=1.20.2
-pufferfishRef=003a28a5dc785ecb8347718dbc59e348d139d33b
+pufferfishRef=c3cd3537bfe9d817dcb4beb40077237c9746168c

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

patches/api/0008-Smooth-Teleports.patch

@@ -7,10 +7,10 @@ Original code by Cryptite, licensed under MIT
 You can find the original code on https://github.com/Cryptite/Slice
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9240ea09206461d61cc08d4252e8507555bf41cf..c585a04bcb130e2cb11518f8672d36847dfb0be9 100644
+index 47fcfa2a3358766dfda2efc9bbcf5b50e3f2f7c1..a7212d04288fb16faba8345663c777a6fd9d2042 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3166,6 +3166,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3229,6 +3229,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      String getClientBrandName();
      // Paper end
 

patches/server/0004-Reduce-constants-allocations.patch

@@ -414,10 +414,10 @@ index 2e324276ea4cd9e528c6a3f9a9ba394b378fe075..8c3648d1fd8aaed641a1a8ead94a9fc5
      private EquipmentSlot(EquipmentSlot.Type type, int entityId, int armorStandId, 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 d6d86597fbca937a32e74ecb913f569f9740e7d8..df197ac924f0f96b0f7a7b3d9f25d133be7413bc 100644
+index 3b9ee3324a084271862ed790e8fc0d469e877ec1..f0ef164a386caf89414aa2b6c8af765da67f1ff6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3140,7 +3140,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3148,7 +3148,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      @Nullable
      private Map<EquipmentSlot, ItemStack> collectEquipmentChanges() {
          Map<EquipmentSlot, ItemStack> map = null;
@@ -480,10 +480,10 @@ index 94396ad1a3c280787d36c6c18256d10340ace488..8e64d01db9f6f3897fffe41f63b5460b
 
          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 4697df75fdee2023c41260bed211e3e3d90d2b9b..4e3dc7a775d9401fb1513fa6cefe5591ea2b9bbf 100644
+index d0f7baa80cb7d0883304abe2ed990c258a0d92b6..be44b34d941ac93e32d1d7f4e7b16aafc2b8af7c 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -1025,7 +1025,7 @@ public final class ItemStack {
+@@ -1027,7 +1027,7 @@ public final class ItemStack {
          int k;
 
          if (ItemStack.shouldShowInTooltip(i, ItemStack.TooltipPart.MODIFIERS)) {

patches/server/0034-Fix-stuck-in-portals.patch

@@ -23,10 +23,10 @@ index bb19a14b0f1afc20e92f7ca0efaf3b453c8d0594..1f97269f92732bf15115b3e2e53b2821
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8b7069f52c3df82f5a9be7e11dca9f442ccc5735..4a2e1f9c6862c58973fb3c7d1a22de8614b5f7a1 100644
+index 3ed1ba6bc41cada4c7966332c65158f2fce07147..654d155102709f6478431409df57b3161a78e58d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1245,6 +1245,7 @@ public class ServerPlayer extends Player {
+@@ -1243,6 +1243,7 @@ public class ServerPlayer extends Player {
                  playerlist.sendPlayerPermissionLevel(this);
                  worldserver1.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
                  this.unsetRemoved();
@@ -35,10 +35,10 @@ index 8b7069f52c3df82f5a9be7e11dca9f442ccc5735..4a2e1f9c6862c58973fb3c7d1a22de86
                  // CraftBukkit end
                  this.setServerLevel(worldserver);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c5a5e6aa4f512b8343a7cac6bd9ab8b72fa4adb4..fb951bc34b44073bdd5fb3be862c017bc578d5cf 100644
+index 80c9a523e94704f73e833e2255af6b0bf55da454..ab9b2156d3060841d1709cd5baa33f8a7d1a2ed6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3077,12 +3077,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3103,12 +3103,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return Vec3.directionFromRotation(this.getRotationVector());
      }
 

patches/server/0035-Entities-can-use-portals-configuration.patch

@@ -22,10 +22,10 @@ index 1f97269f92732bf15115b3e2e53b28218fb21df1..bca7260d38cb84fcfca19b2781f16f89
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index fb951bc34b44073bdd5fb3be862c017bc578d5cf..99102346ea242f6c861903065fb448f56a194141 100644
+index ab9b2156d3060841d1709cd5baa33f8a7d1a2ed6..a1d6c58449263889a92e34459ca3c580e5dec109 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3082,7 +3082,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3108,7 +3108,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          if (this.isOnPortalCooldown()) {
              if (!(dev.etil.mirai.MiraiConfig.playerFixStuckPortal && this instanceof Player && !pos.equals(portalPos))) // Purpur
              this.setPortalCooldown();
@@ -34,7 +34,7 @@ index fb951bc34b44073bdd5fb3be862c017bc578d5cf..99102346ea242f6c861903065fb448f5
              if (!this.level().isClientSide && !pos.equals(this.portalEntrancePos)) {
                  this.portalEntrancePos = pos.immutable();
                  portalPos = BlockPos.ZERO; // Purpur
-@@ -3788,7 +3788,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3814,7 +3814,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
 
      public boolean canChangeDimensions() {

patches/server/0037-vmp-skip-entity-move-if-movement-is-zero.patch

@@ -7,7 +7,7 @@ Original code by RelativityMC, licensed under MIT
 You can find the original code on https://github.com/RelativityMC/VMP-fabric (Yarn mappings)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 99102346ea242f6c861903065fb448f56a194141..c165ff0d07388c8b770f312df5d4202598e311ba 100644
+index a1d6c58449263889a92e34459ca3c580e5dec109..4d6372b557b09b14f1dd8b1535333f079edc27db 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -314,6 +314,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -31,7 +31,7 @@ index 99102346ea242f6c861903065fb448f56a194141..c165ff0d07388c8b770f312df5d42025
          // Paper start - detailed watchdog information
          io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main");
          synchronized (this.posLock) {
-@@ -4035,6 +4042,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4061,6 +4068,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
 
      public final void setBoundingBox(AABB boundingBox) {

patches/server/0047-lithium-entity.fast_elytra_check.patch

@@ -7,10 +7,10 @@ Original code by CaffeineMC, licensed under LGPL v3
 You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings)
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4c52c3ad8e03d8e0286866bb7a6d7a507b4892b4..c399cee5185ad9e3bba410c23e3057c31ee8fea5 100644
+index f0ef164a386caf89414aa2b6c8af765da67f1ff6..1274055768e452a5eef6b3f3fe22f867b9558b2d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3519,6 +3519,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3527,6 +3527,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
 
      private void updateFallFlying() {

patches/server/0048-lithium-entity.fast_hand_swing.patch

@@ -7,10 +7,10 @@ Original code by CaffeineMC, licensed under LGPL v3
 You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings)
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c399cee5185ad9e3bba410c23e3057c31ee8fea5..4719f13b753b190c40f0391026fed1bfa33073aa 100644
+index 1274055768e452a5eef6b3f3fe22f867b9558b2d..442ed0080aaa016d3de54e19c42de42aec29f2bd 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2532,6 +2532,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2540,6 +2540,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
 
      protected void updateSwingTime() {

patches/server/0058-some-entity-micro-opts.patch

@@ -7,7 +7,7 @@ Original code by Titaniumtown, licensed under GPL v3
 You can find the original code on https://gitlab.com/Titaniumtown/JettPack
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6fb35090bfd49ab91509aad5aa11fbccc759ed2a..55e21bb6ba7f59618963468930e2ec2c7e99ae2b 100644
+index 73937a7e640f3705487ff23471f080a9c2eb504c..9ab94da55673af534b7339d4dd779832054e8f4f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2031,12 +2031,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -30,7 +30,7 @@ index 6fb35090bfd49ab91509aad5aa11fbccc759ed2a..55e21bb6ba7f59618963468930e2ec2c
      public void absMoveTo(double x, double y, double z, float yaw, float pitch) {
          this.absMoveTo(x, y, z);
          this.setYRot(yaw % 360.0F);
-@@ -4643,6 +4649,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4669,6 +4675,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
      // Paper end - block invalid positions
 

patches/server/0067-Optimize-default-values-for-configs.patch

@@ -96,7 +96,7 @@ index a27ee205d13dda890646ebf451076f383de0728b..1ef4565c5e4e395ea5c93e7146a7401a
          public boolean strictAdvancementDimensionCheck = false;
          public IntOr.Default compressionLevel = IntOr.Default.USE_DEFAULT;
 diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
-index 84e6fc5bac43ee0499b391827726bc02f6d3e46f..eef3f1f19235ece8f7f1453db40b74f0f631f1c5 100644
+index 071d3877e386a0c7c4d2f2e8ddd06e0765c49d0d..f80b23ce7fec92e08c480a6c37555bb056f402a6 100644
 --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
 @@ -152,8 +152,8 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -209,19 +209,23 @@ index 84e6fc5bac43ee0499b391827726bc02f6d3e46f..eef3f1f19235ece8f7f1453db40b74f0
          });
          public boolean flushRegionsOnSave = false;
      }
-@@ -496,11 +510,22 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -496,13 +510,24 @@ public class WorldConfiguration extends ConfigurationPart {
      public TickRates tickRates;
 
      public class TickRates extends ConfigurationPart {
 -        public int grassSpread = 1;
 -        public int containerUpdate = 1;
 -        public int mobSpawner = 1;
+-        public int wetFarmland = 1;
+-        public int dryFarmland = 1;
 -        public Table<EntityType<?>, String, Integer> sensor = Util.make(HashBasedTable.create(), table -> table.put(EntityType.VILLAGER, "secondarypoisensor", 40));
 -        public Table<EntityType<?>, String, Integer> behavior = Util.make(HashBasedTable.create(), table -> table.put(EntityType.VILLAGER, "validatenearbypoi", -1));
 +        // Mirai start - optimize default values for configs
 +        public int grassSpread = 4;
 +        public int containerUpdate = 3;
 +        public int mobSpawner = 2;
++        public int wetFarmland = 3;
++        public int dryFarmland = 3;
 +        public Table<EntityType<?>, String, Integer> sensor = Util.make(HashBasedTable.create(), table -> {
 +            table.put(EntityType.VILLAGER, "secondarypoisensor", 80);
 +            table.put(EntityType.VILLAGER, "nearestbedsensor", 80);
@@ -237,7 +241,7 @@ index 84e6fc5bac43ee0499b391827726bc02f6d3e46f..eef3f1f19235ece8f7f1453db40b74f0
      }
 
      @Setting(FeatureSeedsGeneration.FEATURE_SEEDS_KEY)
-@@ -509,7 +534,7 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -511,7 +536,7 @@ public class WorldConfiguration extends ConfigurationPart {
      public class FeatureSeeds extends ConfigurationPart {
          @SuppressWarnings("unused") // Is used in FeatureSeedsGeneration
          @Setting(FeatureSeedsGeneration.GENERATE_KEY)
@@ -246,7 +250,7 @@ index 84e6fc5bac43ee0499b391827726bc02f6d3e46f..eef3f1f19235ece8f7f1453db40b74f0
          @Setting(FeatureSeedsGeneration.FEATURES_KEY)
          public Reference2LongMap<Holder<ConfiguredFeature<?, ?>>> features = new Reference2LongOpenHashMap<>();
 
-@@ -523,9 +548,9 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -525,9 +550,9 @@ public class WorldConfiguration extends ConfigurationPart {
 
      public class Misc extends ConfigurationPart {
          public int lightQueueSize = 20;

patches/server/0076-Optimize-Math.round-and-Math.hypot-functions.patch

@@ -213,10 +213,10 @@ index 0de9e45766eabb542b2203bb14f4a11bc69b2c87..5dc60dc29bd1267dd3a72a869fe72951
      }
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index bc1d03f22afb3e2485e5594d2adc9e8a65bc320f..31fa7e8c21119f68778ab8d234d3b7cd876b9c0a 100644
+index 6e9ce3d6f66cdf51ad53a8a07704beb2b77df7c9..a870ca3df92b747669424dce528fba9d35088005 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1574,7 +1574,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1582,7 +1582,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
              if (this instanceof ServerPlayer) {
                  CriteriaTriggers.ENTITY_HURT_PLAYER.trigger((ServerPlayer) this, source, f1, amount, flag);
                  if (f2 > 0.0F && f2 < 3.4028235E37F) {
@@ -225,7 +225,7 @@ index bc1d03f22afb3e2485e5594d2adc9e8a65bc320f..31fa7e8c21119f68778ab8d234d3b7cd
                  }
              }
 
-@@ -2148,9 +2148,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2156,9 +2156,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
 
                  if (f3 > 0.0F && f3 < 3.4028235E37F) {
                      if (this instanceof ServerPlayer) {
@@ -237,7 +237,7 @@ index bc1d03f22afb3e2485e5594d2adc9e8a65bc320f..31fa7e8c21119f68778ab8d234d3b7cd
                      }
                  }
              }
-@@ -2262,9 +2262,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2270,9 +2270,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  float f3 = (float) -event.getDamage(DamageModifier.RESISTANCE);
                  if (f3 > 0.0F && f3 < 3.4028235E37F) {
                      if (this instanceof ServerPlayer) {
@@ -249,7 +249,7 @@ index bc1d03f22afb3e2485e5594d2adc9e8a65bc320f..31fa7e8c21119f68778ab8d234d3b7cd
                      }
                  }
              }
-@@ -2296,7 +2296,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2304,7 +2304,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
              float f2 = absorptionModifier;
 
              if (f2 > 0.0F && f2 < 3.4028235E37F && this instanceof net.minecraft.world.entity.player.Player) {
@@ -258,7 +258,7 @@ index bc1d03f22afb3e2485e5594d2adc9e8a65bc320f..31fa7e8c21119f68778ab8d234d3b7cd
              }
              if (f2 > 0.0F && f2 < 3.4028235E37F) {
                  Entity entity = damagesource.getEntity();
-@@ -2304,7 +2304,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2312,7 +2312,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  if (entity instanceof ServerPlayer) {
                      ServerPlayer entityplayer = (ServerPlayer) entity;
 
@@ -267,7 +267,7 @@ index bc1d03f22afb3e2485e5594d2adc9e8a65bc320f..31fa7e8c21119f68778ab8d234d3b7cd
                  }
              }
 
-@@ -2313,7 +2313,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2321,7 +2321,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                      // PAIL: Be sure to drag all this code from the EntityHuman subclass each update.
                      ((net.minecraft.world.entity.player.Player) this).causeFoodExhaustion(damagesource.getFoodExhaustion(), org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason.DAMAGED); // CraftBukkit - EntityExhaustionEvent
                      if (f < 3.4028235E37F) {
@@ -276,7 +276,7 @@ index bc1d03f22afb3e2485e5594d2adc9e8a65bc320f..31fa7e8c21119f68778ab8d234d3b7cd
                      }
                  }
                  // CraftBukkit end
-@@ -2333,7 +2333,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2341,7 +2341,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                          CriteriaTriggers.ENTITY_HURT_PLAYER.trigger((ServerPlayer) this, damagesource, originalDamage, f, true); // Paper - fix taken/dealt param order
                          f2 = (float) -event.getDamage(DamageModifier.BLOCKING);
                          if (f2 > 0.0F && f2 < 3.4028235E37F) {
@@ -285,7 +285,7 @@ index bc1d03f22afb3e2485e5594d2adc9e8a65bc320f..31fa7e8c21119f68778ab8d234d3b7cd
                          }
                      }
 
-@@ -3103,13 +3103,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3111,13 +3111,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
          this.level().getProfiler().push("rangeChecks");
 
          // Paper start - stop large pitch and yaw changes from crashing the server

patches/server/0082-Configurable-chat-message-signatures.patch

@@ -86,10 +86,10 @@ index d5c38940d151efc0067b7e2859fc8aef006169ab..3d872f4169b99e4b7880c9927245bb05
          // Paper start - fix secure profile with proxy online mode
          return dedicatedserverproperties.enforceSecureProfile
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 1c9cab8c19ce570331afe05cfb81b080c7df8533..92ba960b564c25873ed47945f024502b2f896888 100644
+index 3423decdc9d9451ba11a1ce624c1940f0fcf8bdd..814b8d66843e0aba0aee9fbba912a55928edf69f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2093,7 +2093,7 @@ public class ServerPlayer extends Player {
+@@ -2091,7 +2091,7 @@ public class ServerPlayer extends Player {
      }
 
      public void sendServerStatus(ServerStatus metadata) {