neoforged · qixils · Apr 1, 2026
diff --git a/settings.gradle b/settings.gradle
@@ -7,7 +7,7 @@ plugins {
 }
 
 neoForm {
-    minecraftVersion = '26.1.1'
+    minecraftVersion = '26w14a'
 
     additionalCompileDependencies = [
             'net.neoforged:mergetool:2.0.7:api',

diff --git a/src/patches/net/minecraft/client/Minecraft.java.patch b/src/patches/net/minecraft/client/Minecraft.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Minecraft.java
 +++ b/net/minecraft/client/Minecraft.java
-@@ -2487,7 +_,7 @@
+@@ -2483,7 +_,7 @@
      }
 
      public CompletableFuture<Void> delayTextureReload() {

diff --git a/src/patches/net/minecraft/client/renderer/LevelEventHandler.java.patch b/src/patches/net/minecraft/client/renderer/LevelEventHandler.java.patch
@@ -1,22 +1,22 @@
 --- a/net/minecraft/client/renderer/LevelEventHandler.java
 +++ b/net/minecraft/client/renderer/LevelEventHandler.java
-@@ -313,6 +_,7 @@
+@@ -316,6 +_,7 @@
                  break;
              case 2002:
              case 2007:
 +                {
                  Vec3 particlePos = Vec3.atBottomCenterOf(pos);
                  ItemParticleOption breakParticle = new ItemParticleOption(ParticleTypes.ITEM, Items.SPLASH_POTION);
 
-@@ -351,6 +_,7 @@
+@@ -354,6 +_,7 @@
                  }
 
                  this.level.playLocalSound(pos, SoundEvents.SPLASH_POTION_BREAK, SoundSource.NEUTRAL, 1.0F, random.nextFloat() * 0.1F + 0.9F, false);
 +                }
                  break;
              case 2003:
                  double x = pos.getX() + 0.5;
-@@ -387,11 +_,11 @@
+@@ -390,11 +_,11 @@
                  break;
              case 2004:
                  for (int i = 0; i < 20; i++) {

diff --git a/src/patches/net/minecraft/network/syncher/EntityDataSerializers.java.patch b/src/patches/net/minecraft/network/syncher/EntityDataSerializers.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/network/syncher/EntityDataSerializers.java
 +++ b/net/minecraft/network/syncher/EntityDataSerializers.java
-@@ -97,7 +_,7 @@
+@@ -100,7 +_,7 @@
      );
      public static final EntityDataSerializer<Direction> DIRECTION = EntityDataSerializer.forValueType(Direction.STREAM_CODEC);
      public static final EntityDataSerializer<Optional<EntityReference<LivingEntity>>> OPTIONAL_LIVING_ENTITY_REFERENCE = EntityDataSerializer.forValueType(

diff --git a/src/patches/net/minecraft/server/level/ServerPlayer.java.patch b/src/patches/net/minecraft/server/level/ServerPlayer.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -283,7 +_,7 @@
+@@ -285,7 +_,7 @@
                          private final DynamicOps<HashCode> registryHashOps;
 
                          {

diff --git a/src/patches/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch b/src/patches/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
@@ -1,14 +1,14 @@
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -475,6 +_,7 @@
+@@ -476,6 +_,7 @@
                  }
 
                  vehicle.move(MoverType.PLAYER, new Vec3(xDist, yDist, zDist));
 +                double oyDist = yDist;
                  xDist = targetX - vehicle.getX();
                  yDist = targetY - vehicle.getY();
                  if (yDist > -0.5 || yDist < 0.5) {
-@@ -503,7 +_,7 @@
+@@ -504,7 +_,7 @@
                  vehicle.setOnGroundWithMovement(packet.onGround(), clientDeltaMovement);
                  vehicle.doCheckFallDamage(clientDeltaMovement.x, clientDeltaMovement.y, clientDeltaMovement.z, packet.onGround());
                  this.player.checkMovementStatistics(clientDeltaMovement.x, clientDeltaMovement.y, clientDeltaMovement.z);
@@ -17,7 +17,7 @@
                      && !vehicleRestsOnSomething
                      && !this.server.allowFlight()
                      && !vehicle.isFlyingVehicle()
-@@ -1004,7 +_,7 @@
+@@ -1007,7 +_,7 @@
          if (carried.has(DataComponents.WRITABLE_BOOK_CONTENT)) {
              ItemStack writtenBook = carried.transmuteCopy(Items.WRITTEN_BOOK);
              writtenBook.remove(DataComponents.WRITABLE_BOOK_CONTENT);
@@ -26,15 +26,15 @@
              writtenBook.set(
                  DataComponents.WRITTEN_BOOK_CONTENT, new WrittenBookContent(this.filterableFromOutgoing(title), this.player.getPlainTextName(), 0, pages, true)
              );
-@@ -1126,6 +_,7 @@
+@@ -1129,6 +_,7 @@
 
                                  boolean playerStandsOnSomething = this.player.verticalCollisionBelow;
                                  this.player.move(MoverType.PLAYER, new Vec3(xDist, yDist, zDist));
 +                                double oyDist = yDist;
                                  xDist = targetX - this.player.getX();
                                  yDist = targetY - this.player.getY();
                                  if (yDist > -0.5 || yDist < 0.5) {
-@@ -1151,7 +_,7 @@
+@@ -1154,7 +_,7 @@
                                          && !this.isEntityCollidingWithAnythingNew(level, this.player, oldAABB, targetX, targetY, targetZ)) {
                                      this.player.absSnapTo(targetX, targetY, targetZ, targetYRot, targetXRot);
                                      boolean isAutoSpinAttack = this.player.isAutoSpinAttack();

diff --git a/src/patches/net/minecraft/util/datafix/DataFixers.java.patch b/src/patches/net/minecraft/util/datafix/DataFixers.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/util/datafix/DataFixers.java
 +++ b/net/minecraft/util/datafix/DataFixers.java
-@@ -1167,7 +_,7 @@
+@@ -1168,7 +_,7 @@
          );
          Schema v3086 = fixerUpper.addSchema(3086, SAME_NAMESPACED);
          fixerUpper.addFixer(
@@ -9,7 +9,7 @@
                  m.defaultReturnValue("minecraft:tabby");
                  m.put(0, "minecraft:tabby");
                  m.put(1, "minecraft:black");
-@@ -1203,7 +_,7 @@
+@@ -1204,7 +_,7 @@
          Schema v3087 = fixerUpper.addSchema(3087, SAME_NAMESPACED);
          fixerUpper.addFixer(
              new EntityVariantFix(

diff --git a/src/patches/net/minecraft/world/entity/ai/behavior/InteractWith.java.patch b/src/patches/net/minecraft/world/entity/ai/behavior/InteractWith.java.patch
@@ -1,11 +1,11 @@
 --- a/net/minecraft/world/entity/ai/behavior/InteractWith.java
 +++ b/net/minecraft/world/entity/ai/behavior/InteractWith.java
-@@ -39,7 +_,7 @@
-                     if (selfFilter.test(body) && entities.contains(isTargetValid)) {
-                         Optional<LivingEntity> closest = entities.findClosest(mob -> mob.distanceToSqr(body) <= interactionRangeSqr && isTargetValid.test(mob));
-                         closest.ifPresent(mob -> {
--                            target.set(mob);
-+                            target.set((T)mob);
-                             lookTarget.set(new EntityTracker(mob, true));
-                             walkTarget.set(new WalkTarget(new EntityTracker(mob, false), speedModifier, stopDistance));
-                         });
+@@ -44,7 +_,7 @@
+                                 mob -> mob.distanceToSqr(body) <= interactionRangeSqr && isTargetValid.test(mob)
+                             );
+                             closest.ifPresent(mob -> {
+-                                target.set(mob);
++                                target.set((T)mob);
+                                 lookTarget.set(new EntityTracker(mob, true));
+                                 walkTarget.set(new WalkTarget(new EntityTracker(mob, false), speedModifier, stopDistance));
+                             });
diff --git a/src/patches/net/minecraft/world/entity/ai/behavior/SocializeAtBell.java.patch b/src/patches/net/minecraft/world/entity/ai/behavior/SocializeAtBell.java.patch
@@ -0,0 +1,19 @@
+--- a/net/minecraft/world/entity/ai/behavior/SocializeAtBell.java
++++ b/net/minecraft/world/entity/ai/behavior/SocializeAtBell.java
+@@ -7,6 +_,7 @@
+ import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+ import net.minecraft.world.entity.ai.memory.NearestVisibleLivingEntities;
+ import net.minecraft.world.entity.ai.memory.WalkTarget;
++import net.minecraft.world.entity.npc.villager.Villager;
+
+ public class SocializeAtBell {
+     private static final float SPEED_MODIFIER = 0.3F;
+@@ -30,7 +_,7 @@
+                             && memory.pos().closerToCenterThan(body.position(), 4.0)
+                             && visibleEntities.contains(mob -> mob.is(EntityType.VILLAGER))) {
+                             visibleEntities.findClosest(mob -> mob.is(EntityType.VILLAGER) && mob.distanceToSqr(body) <= 32.0).ifPresent(mob -> {
+-                                interactionTarget.set(mob);
++                                interactionTarget.set((Villager)mob);
+                                 lookTarget.set(new EntityTracker(mob, true));
+                                 walkTarget.set(new WalkTarget(new EntityTracker(mob, false), 0.3F, 1));
+                             });
diff --git a/src/patches/net/minecraft/world/entity/animal/allay/Allay.java.patch b/src/patches/net/minecraft/world/entity/animal/allay/Allay.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/animal/allay/Allay.java
 +++ b/net/minecraft/world/entity/animal/allay/Allay.java
-@@ -78,7 +_,7 @@
+@@ -79,7 +_,7 @@
      public static final int MAX_NOTEBLOCK_DISTANCE = 1024;
      private static final EntityDataAccessor<Boolean> DATA_DANCING = SynchedEntityData.defineId(Allay.class, EntityDataSerializers.BOOLEAN);
      private static final EntityDataAccessor<Boolean> DATA_CAN_DUPLICATE = SynchedEntityData.defineId(Allay.class, EntityDataSerializers.BOOLEAN);
@@ -9,7 +9,7 @@
          List.of(MemoryModuleType.LIKED_PLAYER, MemoryModuleType.LIKED_NOTEBLOCK_POSITION, MemoryModuleType.LIKED_NOTEBLOCK_COOLDOWN_TICKS),
          List.of(SensorType.NEAREST_LIVING_ENTITIES, SensorType.NEAREST_PLAYERS, SensorType.HURT_BY, SensorType.NEAREST_ITEMS),
          var0 -> AllayAi.getActivities()
-@@ -118,7 +_,7 @@
+@@ -119,7 +_,7 @@
 
      @Override
      public Brain<Allay> getBrain() {

diff --git a/src/patches/net/minecraft/world/entity/animal/armadillo/Armadillo.java.patch b/src/patches/net/minecraft/world/entity/animal/armadillo/Armadillo.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/animal/armadillo/Armadillo.java
 +++ b/net/minecraft/world/entity/animal/armadillo/Armadillo.java
-@@ -58,7 +_,7 @@
+@@ -59,7 +_,7 @@
      public static final int SCARE_CHECK_INTERVAL = 80;
      private static final double SCARE_DISTANCE_HORIZONTAL = 7.0;
      private static final double SCARE_DISTANCE_VERTICAL = 2.0;
@@ -9,7 +9,7 @@
          List.of(
              SensorType.NEAREST_LIVING_ENTITIES, SensorType.HURT_BY, SensorType.FOOD_TEMPTATIONS, SensorType.NEAREST_ADULT, SensorType.ARMADILLO_SCARE_DETECTED
          ),
-@@ -131,7 +_,7 @@
+@@ -132,7 +_,7 @@
 
      @Override
      public Brain<Armadillo> getBrain() {

diff --git a/src/patches/net/minecraft/world/entity/animal/axolotl/Axolotl.java.patch b/src/patches/net/minecraft/world/entity/animal/axolotl/Axolotl.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 +++ b/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-@@ -74,7 +_,7 @@
+@@ -76,7 +_,7 @@
  public class Axolotl extends Animal implements Bucketable {
      public static final int TOTAL_PLAYDEAD_TIME = 200;
      private static final int POSE_ANIMATION_TICKS = 10;
@@ -9,7 +9,7 @@
          List.of(SensorType.NEAREST_LIVING_ENTITIES, SensorType.NEAREST_ADULT, SensorType.HURT_BY, SensorType.AXOLOTL_ATTACKABLES, SensorType.FOOD_TEMPTATIONS),
          var0 -> AxolotlAi.getActivities()
      );
-@@ -527,7 +_,7 @@
+@@ -529,7 +_,7 @@
 
      @Override
      public Brain<Axolotl> getBrain() {

diff --git a/src/patches/net/minecraft/world/entity/animal/fox/Fox.java.patch b/src/patches/net/minecraft/world/entity/animal/fox/Fox.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/animal/fox/Fox.java
 +++ b/net/minecraft/world/entity/animal/fox/Fox.java
-@@ -739,8 +_,7 @@
+@@ -745,8 +_,7 @@
          private @Nullable LivingEntity trustedLastHurt;
          private int timestamp;
 

diff --git a/src/patches/net/minecraft/world/entity/animal/frog/Frog.java.patch b/src/patches/net/minecraft/world/entity/animal/frog/Frog.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/animal/frog/Frog.java
 +++ b/net/minecraft/world/entity/animal/frog/Frog.java
-@@ -68,7 +_,7 @@
+@@ -67,7 +_,7 @@
  import org.jspecify.annotations.Nullable;
 
  public class Frog extends Animal {
@@ -9,7 +9,7 @@
          List.of(SensorType.NEAREST_LIVING_ENTITIES, SensorType.HURT_BY, SensorType.FROG_ATTACKABLES, SensorType.FROG_TEMPTATIONS, SensorType.IS_IN_WATER),
          var0 -> FrogAi.getActivities()
      );
-@@ -98,7 +_,7 @@
+@@ -97,7 +_,7 @@
 
      @Override
      public Brain<Frog> getBrain() {

diff --git a/src/patches/net/minecraft/world/entity/animal/goat/Goat.java.patch b/src/patches/net/minecraft/world/entity/animal/goat/Goat.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/net/minecraft/world/entity/animal/goat/Goat.java
-@@ -58,7 +_,7 @@
+@@ -57,7 +_,7 @@
      private static final float BABY_SCALE = 0.55F;
      private static final int ADULT_ATTACK_DAMAGE = 2;
      private static final int BABY_ATTACK_DAMAGE = 1;
@@ -9,7 +9,7 @@
          List.of(
              SensorType.NEAREST_LIVING_ENTITIES,
              SensorType.NEAREST_PLAYERS,
-@@ -161,7 +_,7 @@
+@@ -160,7 +_,7 @@
 
      @Override
      public Brain<Goat> getBrain() {

diff --git a/src/patches/net/minecraft/world/entity/animal/sniffer/Sniffer.java.patch b/src/patches/net/minecraft/world/entity/animal/sniffer/Sniffer.java.patch
@@ -9,7 +9,7 @@
          List.of(MemoryModuleType.SNIFFER_EXPLORED_POSITIONS),
          List.of(SensorType.NEAREST_LIVING_ENTITIES, SensorType.HURT_BY, SensorType.NEAREST_PLAYERS, SensorType.FOOD_TEMPTATIONS),
          var0 -> SnifferAi.getActivities()
-@@ -447,7 +_,7 @@
+@@ -441,7 +_,7 @@
 
      @Override
      public Brain<Sniffer> getBrain() {

diff --git a/src/patches/net/minecraft/world/entity/monster/Zoglin.java.patch b/src/patches/net/minecraft/world/entity/monster/Zoglin.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/monster/Zoglin.java
 +++ b/net/minecraft/world/entity/monster/Zoglin.java
-@@ -89,7 +_,7 @@
+@@ -90,7 +_,7 @@
      }
 
      private static ActivityData<Zoglin> initIdleActivity() {
@@ -9,7 +9,7 @@
              Activity.IDLE,
              10,
              ImmutableList.of(
-@@ -105,7 +_,7 @@
+@@ -106,7 +_,7 @@
      }
 
      private static ActivityData<Zoglin> initFightActivity() {
@@ -18,7 +18,7 @@
              Activity.FIGHT,
              10,
              ImmutableList.of(
-@@ -208,7 +_,7 @@
+@@ -212,7 +_,7 @@
 
      @Override
      public Brain<Zoglin> getBrain() {

diff --git a/src/patches/net/minecraft/world/entity/monster/breeze/BreezeAi.java.patch b/src/patches/net/minecraft/world/entity/monster/breeze/BreezeAi.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/monster/breeze/BreezeAi.java
 +++ b/net/minecraft/world/entity/monster/breeze/BreezeAi.java
-@@ -38,11 +_,11 @@
+@@ -37,11 +_,11 @@
      }
 
      private static ActivityData<Breeze> initCoreActivity() {
@@ -14,7 +14,7 @@
              Activity.IDLE,
              ImmutableList.of(
                  Pair.of(0, StartAttacking.create((var0, breeze) -> breeze.getBrain().getMemory(MemoryModuleType.NEAREST_ATTACKABLE))),
-@@ -63,7 +_,7 @@
+@@ -53,7 +_,7 @@
      }
 
      private static ActivityData<Breeze> initFightActivity(Breeze body) {

diff --git a/src/patches/net/minecraft/world/entity/monster/creaking/CreakingAi.java.patch b/src/patches/net/minecraft/world/entity/monster/creaking/CreakingAi.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/monster/creaking/CreakingAi.java
 +++ b/net/minecraft/world/entity/monster/creaking/CreakingAi.java
-@@ -28,15 +_,15 @@
+@@ -29,15 +_,15 @@
 
  public class CreakingAi {
      static ActivityData<Creaking> initCoreActivity() {
@@ -19,7 +19,7 @@
              Activity.IDLE,
              10,
              ImmutableList.of(
-@@ -55,7 +_,7 @@
+@@ -56,7 +_,7 @@
      }
 
      static ActivityData<Creaking> initFightActivity(Creaking body) {

diff --git a/src/patches/net/minecraft/world/entity/monster/hoglin/Hoglin.java.patch b/src/patches/net/minecraft/world/entity/monster/hoglin/Hoglin.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 +++ b/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-@@ -62,7 +_,7 @@
+@@ -63,7 +_,7 @@
      private int attackAnimationRemainingTicks;
      private int timeInOverworld = 0;
      private boolean cannotBeHunted = false;
@@ -9,7 +9,7 @@
          List.of(SensorType.NEAREST_LIVING_ENTITIES, SensorType.NEAREST_PLAYERS, SensorType.NEAREST_ADULT, SensorType.HOGLIN_SPECIFIC_SENSOR),
          var0 -> HoglinAi.getActivities()
      );
-@@ -128,7 +_,7 @@
+@@ -129,7 +_,7 @@
 
      @Override
      public Brain<Hoglin> getBrain() {

diff --git a/src/patches/net/minecraft/world/entity/monster/hoglin/HoglinAi.java.patch b/src/patches/net/minecraft/world/entity/monster/hoglin/HoglinAi.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/monster/hoglin/HoglinAi.java
 +++ b/net/minecraft/world/entity/monster/hoglin/HoglinAi.java
-@@ -64,7 +_,7 @@
+@@ -65,7 +_,7 @@
      }
 
      private static ActivityData<Hoglin> initIdleActivity() {
@@ -9,7 +9,7 @@
              Activity.IDLE,
              10,
              ImmutableList.of(
-@@ -81,7 +_,7 @@
+@@ -82,7 +_,7 @@
      }
 
      private static ActivityData<Hoglin> initFightActivity() {
@@ -18,7 +18,7 @@
              Activity.FIGHT,
              10,
              ImmutableList.of(
-@@ -98,14 +_,14 @@
+@@ -99,14 +_,14 @@
      }
 
      private static ActivityData<Hoglin> initRetreatActivity() {

diff --git a/src/patches/net/minecraft/world/entity/monster/piglin/PiglinBrute.java.patch b/src/patches/net/minecraft/world/entity/monster/piglin/PiglinBrute.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
 +++ b/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
-@@ -33,7 +_,7 @@
+@@ -32,7 +_,7 @@
      private static final float MOVEMENT_SPEED_WHEN_FIGHTING = 0.35F;
      private static final int ATTACK_DAMAGE = 7;
      private static final double TARGETING_RANGE = 12.0;
@@ -9,7 +9,7 @@
          List.of(MemoryModuleType.NEAREST_VISIBLE_ADULT_PIGLINS),
          List.of(
              SensorType.NEAREST_LIVING_ENTITIES,
-@@ -79,7 +_,7 @@
+@@ -78,7 +_,7 @@
 
      @Override
      public Brain<PiglinBrute> getBrain() {