fix(#89): fix patches

versions/26.1-snapshot-1/build.gradle.kts

@@ -4,6 +4,10 @@ plugins {
     id("io.papermc.sculptor.version") version "2.0.0-SNAPSHOT"
 }
 
+repositories {
+    maven("https://central.sonatype.com/repository/maven-snapshots/")
+}
+
 val generateReportsProperty = providers.gradleProperty("generateReports")
 mache {
     minecraftVersion = "26.1-snapshot-1"
@@ -33,7 +37,7 @@ tasks.withType<JavaCompile>().configureEach {
 
 dependencies {
     codebook("2.0.0-SNAPSHOT")
-    decompiler(vineflower("1.11.2"))
+    decompiler(vineflower("1.12.0-SNAPSHOT"))
     constants("io.papermc.parchment.data:parchment:1.21.11+build.3")
 }
 

versions/26.1-snapshot-1/patches/net/minecraft/advancements/criterion/PlayerPredicate.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/advancements/criterion/PlayerPredicate.java
 +++ b/net/minecraft/advancements/criterion/PlayerPredicate.java
-@@ -243,11 +_,11 @@
+@@ -259,11 +_,11 @@
          private static <T> MapCodec<PlayerPredicate.StatMatcher<T>> createTypedCodec(final StatType<T> type) {
              return RecordCodecBuilder.mapCodec(
                  i -> i.group(

versions/26.1-snapshot-1/patches/net/minecraft/core/RegistrySetBuilder.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/core/RegistrySetBuilder.java
 +++ b/net/minecraft/core/RegistrySetBuilder.java
-@@ -420,13 +_,13 @@
+@@ -421,13 +_,13 @@
          }
 
          private <T> Holder.Reference<T> getOrCreate(final ResourceKey<T> id) {

versions/26.1-snapshot-1/patches/net/minecraft/core/registries/BuiltInRegistries.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/core/registries/BuiltInRegistries.java
 +++ b/net/minecraft/core/registries/BuiltInRegistries.java
-@@ -385,7 +_,7 @@
+@@ -387,7 +_,7 @@
          Bootstrap.checkBootstrapCalled(() -> "registry " + name.identifier());
          Identifier key = name.identifier();
          LOADERS.put(key, () -> loader.run(registry));

versions/26.1-snapshot-1/patches/net/minecraft/network/syncher/EntityDataSerializer.java.patch

@@ -8,4 +8,4 @@
 +        return (ForValueType<T>) () -> codec;
      }
 
-     public interface ForValueType<T> extends EntityDataSerializer<T> {
+     interface ForValueType<T> extends EntityDataSerializer<T> {

versions/26.1-snapshot-1/patches/net/minecraft/resources/RegistryDataLoader.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/resources/RegistryDataLoader.java
 +++ b/net/minecraft/resources/RegistryDataLoader.java
-@@ -85,7 +_,7 @@
+@@ -97,7 +_,7 @@
 
  public class RegistryDataLoader {
      private static final Logger LOGGER = LogUtils.getLogger();

versions/26.1-snapshot-1/patches/net/minecraft/server/ServerScoreboard.java.patch

@@ -0,0 +1,25 @@
+--- a/net/minecraft/server/ServerScoreboard.java
++++ b/net/minecraft/server/ServerScoreboard.java
+@@ -34,19 +_,13 @@
+     }
+
+     public void load(final ScoreboardSaveData.Packed data) {
+-        List var10000 = data.objectives();
+-        ServerScoreboard var2 = this;
+-        var10000.forEach(x$0 -> var2.loadObjective(x$0));
+-        var10000 = data.scores();
+-        var2 = this;
+-        var10000.forEach(x$0 -> var2.loadPlayerScore(x$0));
++        data.objectives().forEach(this::loadObjective);
++        data.scores().forEach(this::loadPlayerScore);
+         data.displaySlots().forEach((slot, name) -> {
+             Objective objective = this.getObjective(name);
+             this.setDisplayObjective(slot, objective);
+         });
+-        var10000 = data.teams();
+-        var2 = this;
+-        var10000.forEach(x$0 -> var2.loadPlayerTeam(x$0));
++        data.teams().forEach(this::loadPlayerTeam);
+     }
+
+     private ScoreboardSaveData.Packed store() {

versions/26.1-snapshot-1/patches/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch

@@ -1,23 +1,6 @@
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -463,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) {
-@@ -491,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);
--                this.clientVehicleIsFloating = yDist >= -0.03125
-+                this.clientVehicleIsFloating = oyDist >= -0.03125
-                     && !vehicleRestsOnSomething
-                     && !this.server.allowFlight()
-                     && !vehicle.isFlyingVehicle()
-@@ -956,7 +_,7 @@
+@@ -961,7 +_,7 @@
          if (carried.has(DataComponents.WRITABLE_BOOK_CONTENT)) {
              ItemStack writtenBook = carried.transmuteCopy(Items.WRITTEN_BOOK);
              writtenBook.remove(DataComponents.WRITABLE_BOOK_CONTENT);
@@ -26,20 +9,3 @@
              writtenBook.set(
                  DataComponents.WRITTEN_BOOK_CONTENT, new WrittenBookContent(this.filterableFromOutgoing(title), this.player.getPlainTextName(), 0, pages, true)
              );
-@@ -1078,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) {
-@@ -1102,7 +_,7 @@
-                                         && !this.isEntityCollidingWithAnythingNew(level, this.player, oldAABB, targetX, targetY, targetZ)) {
-                                     this.player.absSnapTo(targetX, targetY, targetZ, targetYRot, targetXRot);
-                                     boolean isAutoSpinAttack = this.player.isAutoSpinAttack();
--                                    this.clientIsFloating = yDist >= -0.03125
-+                                    this.clientIsFloating = oyDist >= -0.03125
-                                         && !playerStandsOnSomething
-                                         && !this.player.isSpectator()
-                                         && !this.server.allowFlight()

versions/26.1-snapshot-1/patches/net/minecraft/util/ExtraCodecs.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/util/ExtraCodecs.java
 +++ b/net/minecraft/util/ExtraCodecs.java
-@@ -276,7 +_,7 @@
+@@ -280,7 +_,7 @@
              P max = l.get(1);
              return makeInterval.apply(min, max);
          }), p -> ImmutableList.of(getMin.apply((I)p), getMax.apply((I)p)));

versions/26.1-snapshot-1/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
-@@ -1149,7 +_,7 @@
+@@ -1153,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");
-@@ -1185,7 +_,7 @@
+@@ -1189,7 +_,7 @@
          Schema v3087 = fixerUpper.addSchema(3087, SAME_NAMESPACED);
          fixerUpper.addFixer(
              new EntityVariantFix(

versions/26.1-snapshot-1/patches/net/minecraft/util/datafix/fixes/LeavesFix.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/util/datafix/fixes/LeavesFix.java
 +++ b/net/minecraft/util/datafix/fixes/LeavesFix.java
-@@ -347,7 +_,7 @@
+@@ -345,7 +_,7 @@
              return this.isSkippable()
                  ? section
                  : section.update(DSL.remainderFinder(), tag -> tag.set("BlockStates", tag.createLongList(Arrays.stream(this.storage.getRaw()))))

versions/26.1-snapshot-1/patches/net/minecraft/world/attribute/modifier/FloatModifier.java.patch

@@ -14,4 +14,4 @@
 +    FloatModifier<Float> MAXIMUM = (Simple) Math::max;
 
      @FunctionalInterface
-     public interface Simple extends FloatModifier<Float> {
+     interface Simple extends FloatModifier<Float> {

versions/26.1-snapshot-1/patches/net/minecraft/world/entity/SpawnPlacements.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/SpawnPlacements.java
 +++ b/net/minecraft/world/entity/SpawnPlacements.java
-@@ -77,7 +_,7 @@
+@@ -78,7 +_,7 @@
          final EntityType<T> type, final ServerLevelAccessor level, final EntitySpawnReason spawnReason, final BlockPos pos, final RandomSource random
      ) {
          SpawnPlacements.Data data = DATA_BY_TYPE.get(type);

versions/26.1-snapshot-1/patches/net/minecraft/world/entity/animal/HappyGhastAi.java.patch → versions/26.1-snapshot-1/patches/net/minecraft/world/entity/animal/happyghast/HappyGhastAi.java.patch

@@ -1,5 +1,5 @@
---- a/net/minecraft/world/entity/animal/HappyGhastAi.java
-+++ b/net/minecraft/world/entity/animal/HappyGhastAi.java
+--- a/net/minecraft/world/entity/animal/happyghast/HappyGhastAi.java
++++ b/net/minecraft/world/entity/animal/happyghast/HappyGhastAi.java
 @@ -69,7 +_,7 @@
              0,
              ImmutableList.of(

versions/26.1-snapshot-1/patches/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch

@@ -1,15 +1,15 @@
 --- a/net/minecraft/world/entity/monster/piglin/PiglinAi.java
 +++ b/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-@@ -174,7 +_,7 @@
-                 BehaviorBuilder.triggerIf(PiglinAi::hasCrossbow, BackUpIfTooClose.create(5, 0.75F)),
-                 SetWalkTargetFromAttackTargetIfTargetOutOfReach.create(1.0F),
+@@ -181,7 +_,7 @@
+                 new SpearAttack(1.0, 1.0, 2.0F),
+                 new SpearRetreat(1.0),
                  MeleeAttack.create(20),
 -                new CrossbowAttack(),
 +                new CrossbowAttack<>(),
                  RememberIfHoglinWasKilled.create(),
                  EraseMemoryIf.create(PiglinAi::isNearZombified, MemoryModuleType.ATTACK_TARGET)
              ),
-@@ -192,7 +_,7 @@
+@@ -199,7 +_,7 @@
                  StartAttacking.<Piglin>create((level, piglin) -> piglin.isAdult(), PiglinAi::findNearestValidAttackTarget),
                  BehaviorBuilder.triggerIf(body -> !body.isDancing(), GoToTargetLocation.create(MemoryModuleType.CELEBRATE_LOCATION, 2, 1.0F)),
                  BehaviorBuilder.triggerIf(Piglin::isDancing, GoToTargetLocation.create(MemoryModuleType.CELEBRATE_LOCATION, 4, 0.6F)),
@@ -18,7 +18,7 @@
                      ImmutableList.of(
                          Pair.of(SetEntityLookTarget.create(EntityType.PIGLIN, 8.0F), 1),
                          Pair.of(RandomStroll.stroll(0.6F, 2, 1), 1),
-@@ -225,7 +_,7 @@
+@@ -232,7 +_,7 @@
                  SetWalkTargetAwayFrom.entity(MemoryModuleType.AVOID_TARGET, 1.0F, 12, true),
                  createIdleLookBehaviors(),
                  createIdleMovementBehaviors(),
@@ -27,7 +27,7 @@
              ),
              MemoryModuleType.AVOID_TARGET
          );
-@@ -247,7 +_,7 @@
+@@ -254,7 +_,7 @@
                              .build()
                      )
                  ),

versions/26.1-snapshot-1/patches/net/minecraft/world/entity/variant/PriorityProvider.java.patch

@@ -3,7 +3,7 @@
 @@ -103,7 +_,7 @@
      }
 
-     public record UnpackedEntry<C, T>(T entry, int priority, PriorityProvider.SelectorCondition<C> condition) {
+     record UnpackedEntry<C, T>(T entry, int priority, PriorityProvider.SelectorCondition<C> condition) {
 -        public static final Comparator<PriorityProvider.UnpackedEntry<?, ?>> HIGHEST_PRIORITY_FIRST = Comparator.comparingInt(
 +        public static final Comparator<PriorityProvider.UnpackedEntry<?, ?>> HIGHEST_PRIORITY_FIRST = Comparator.<PriorityProvider.UnpackedEntry<?, ?>>comparingInt(
                  PriorityProvider.UnpackedEntry::priority

versions/26.1-snapshot-1/patches/net/minecraft/world/item/AdventureModePredicate.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/item/AdventureModePredicate.java
 +++ b/net/minecraft/world/item/AdventureModePredicate.java
-@@ -113,7 +_,7 @@
+@@ -119,7 +_,7 @@
          return predicates.stream()
              .flatMap(predicatex -> predicatex.blocks().orElseThrow().stream())
              .distinct()

versions/26.1-snapshot-1/patches/net/minecraft/world/item/HoneycombItem.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/item/HoneycombItem.java
 +++ b/net/minecraft/world/item/HoneycombItem.java
-@@ -89,7 +_,7 @@
+@@ -143,7 +_,7 @@
          Level level = context.getLevel();
          BlockPos pos = context.getClickedPos();
          BlockState oldState = level.getBlockState(pos);

versions/26.1-snapshot-1/patches/net/minecraft/world/item/component/KineticWeapon.java.patch

@@ -0,0 +1,19 @@
+--- a/net/minecraft/world/item/component/KineticWeapon.java
++++ b/net/minecraft/world/item/component/KineticWeapon.java
+@@ -6,6 +_,7 @@
+ import java.util.Collection;
+ import java.util.List;
+ import java.util.Optional;
++import java.util.function.Function;
+ import net.minecraft.advancements.CriteriaTriggers;
+ import net.minecraft.core.Holder;
+ import net.minecraft.network.RegistryFriendlyByteBuf;
+@@ -113,7 +_,7 @@
+             for (EntityHitResult hitResult : ProjectileUtil.getHitEntitiesAlong(
+                     livingEntity, attackRange, e -> PiercingWeapon.canHitEntity(livingEntity, e), ClipContext.Block.COLLIDER
+                 )
+-                .map(a -> List.of(), e -> (Collection)e)) {
++                .map(a -> List.<EntityHitResult>of(), Function.identity())) {
+                 Entity otherEntity = hitResult.getEntity();
+                 if (otherEntity instanceof EnderDragonPart dragonPart) {
+                     otherEntity = dragonPart.parentMob;