25w44a init

server/notifications

world/entity

server/level

level/block

GameRules

MinecraftGameRuleServiceImpl

DispenseItemBehavior

GameRuleCommand

EnderDragon

ServerStatsCounter

PlayerList

DedicatedServer

Connection

Llama

HopperBlockEntity

TestEnvironmentDefinition

EatBlockGoal

MinecraftServer

JsonRpcNotificationService

PathNavigation

LargeFireball

AbstractNautilus, ServerGamePacketListenerImpl

Start fixing type annotation issues

Misc compile fixes

Author: jpenilla

gradle.properties

@@ -1,6 +1,6 @@
 group=io.papermc.paper
-version=25w43a-R0.1-SNAPSHOT
-mcVersion=25w43a
+version=25w44a-R0.1-SNAPSHOT
+mcVersion=25w44a
 # This is the current API version for use in (paper-)plugin.yml files
 # During snapshot cycles this should be the anticipated version of the release target
 apiVersion=1.21.11

paper-server/build.gradle.kts

@@ -14,7 +14,7 @@ plugins {
 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
 
 dependencies {
-    mache("io.papermc:mache:25w43a+build.6")
+    mache("io.papermc:mache:25w44a+build.2")
     paperclip("io.papermc:paperclip:3.0.3")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
@@ -42,7 +42,7 @@ paperweight {
     )
 
     updatingMinecraft {
-        //oldPaperCommit = "474d54da728306598f93b4a779578eee5cf54423"
+        // oldPaperCommit = "1eb13b0290e7617407e6bde0e59570ebde61d2ed"
     }
 }
 

paper-server/patches/sources/com/mojang/math/OctahedralGroup.java.patch

@@ -1,6 +1,6 @@
 --- a/com/mojang/math/OctahedralGroup.java
 +++ b/com/mojang/math/OctahedralGroup.java
-@@ -116,6 +_,12 @@
+@@ -115,6 +_,12 @@
          }
      );
 
@@ -13,7 +13,7 @@
      private OctahedralGroup(final String name, final SymmetricGroup3 permutation, final boolean invertX, final boolean invertY, final boolean invertZ) {
          this.name = name;
          this.invertX = invertX;
-@@ -156,7 +_,7 @@
+@@ -155,7 +_,7 @@
          return this.name;
      }
 
@@ -22,7 +22,7 @@
          if (this.rotatedDirections == null) {
              this.rotatedDirections = Util.makeEnumMap(Direction.class, direction1 -> {
                  Direction.Axis axis = direction1.getAxis();
-@@ -167,6 +_,11 @@
+@@ -166,6 +_,11 @@
              });
          }
 

paper-server/patches/sources/net/minecraft/ChatFormatting.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/ChatFormatting.java
 +++ b/net/minecraft/ChatFormatting.java
-@@ -118,6 +_,19 @@
+@@ -114,6 +_,19 @@
          return friendlyName == null ? null : FORMATTING_BY_NAME.get(cleanName(friendlyName));
      }
 
@@ -17,6 +17,6 @@
 +    }
 +    // Paper end - add method to get by hex value
 +
-     @Nullable
-     public static ChatFormatting getById(int index) {
+     public static @Nullable ChatFormatting getById(int index) {
          if (index < 0) {
+             return RESET;

paper-server/patches/sources/net/minecraft/CrashReport.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/CrashReport.java
 +++ b/net/minecraft/CrashReport.java
-@@ -32,8 +_,10 @@
+@@ -31,8 +_,10 @@
      private final SystemReport systemReport = new SystemReport();
 
      public CrashReport(String title, Throwable exception) {
@@ -11,7 +11,7 @@
      }
 
      public String getTitle() {
-@@ -218,7 +_,7 @@
+@@ -216,7 +_,7 @@
      }
 
      public static void preload() {

paper-server/patches/sources/net/minecraft/Util.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/Util.java
 +++ b/net/minecraft/Util.java
-@@ -89,9 +_,25 @@
+@@ -90,9 +_,25 @@
      private static final int DEFAULT_MAX_THREADS = 255;
      private static final int DEFAULT_SAFE_FILE_OPERATION_RETRIES = 10;
      private static final String MAX_THREADS_SYSTEM_PROPERTY = "max.bg.threads";
@@ -28,15 +28,15 @@
      private static final DateTimeFormatter FILENAME_DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd_HH.mm.ss", Locale.ROOT);
      public static final int LINEAR_LOOKUP_THRESHOLD = 8;
      private static final Set<String> ALLOWED_UNTRUSTED_LINK_PROTOCOLS = Set.of("http", "https");
-@@ -110,6 +_,7 @@
+@@ -111,6 +_,7 @@
          .findFirst()
          .orElseThrow(() -> new IllegalStateException("No jar file system provider found"));
      private static Consumer<String> thePauser = string -> {};
 +    public static final double COLLISION_EPSILON = 1.0E-7; // Paper - Check distance in entity interactions
 
      public static <K, V> Collector<Entry<? extends K, ? extends V>, ?, Map<K, V>> toMap() {
          return Collectors.toMap(Entry::getKey, Entry::getValue);
-@@ -132,7 +_,7 @@
+@@ -133,7 +_,7 @@
      }
 
      public static long getNanos() {
@@ -45,7 +45,7 @@
      }
 
      public static long getEpochMillis() {
-@@ -143,9 +_,10 @@
+@@ -144,9 +_,10 @@
          return FILENAME_DATE_TIME_FORMATTER.format(ZonedDateTime.now());
      }
 
@@ -58,7 +58,7 @@
          if (i <= 0) {
              directExecutorService = MoreExecutors.newDirectExecutorService();
          } else {
-@@ -170,16 +_,30 @@
+@@ -171,16 +_,30 @@
                          super.onTermination(throwOnTermination);
                      }
                  };
@@ -91,11 +91,10 @@
      }
 
      private static int getMaxThreads() {
-@@ -229,6 +_,21 @@
-             return thread;
+@@ -231,6 +_,21 @@
          }));
      }
-+
+ 
 +    // Paper start - Separate dimension data IO pool
 +    private static TracingExecutor makeExtraIoExecutor(String namePrefix) {
 +        AtomicInteger atomicInteger = new AtomicInteger(1);
@@ -110,6 +109,87 @@
 +        }));
 +    }
 +    // Paper end - Separate dimension data IO pool
- 
++
      public static void throwAsRuntime(Throwable throwable) {
          throw throwable instanceof RuntimeException ? (RuntimeException)throwable : new RuntimeException(throwable);
+     }
+@@ -297,6 +_,19 @@
+         return input -> true;
+     }
+ 
++    @SafeVarargs
++    public static <T> Predicate<T> allOf(Predicate<? super T>... predicates) {
++        return input -> {
++            for (Predicate<? super T> predicate : predicates) {
++                if (!predicate.test(input)) {
++                    return false;
++                }
++            }
++
++            return true;
++        };
++    }
++
+     public static <T> Predicate<T> allOf(Predicate<? super T> predicate) {
+         return (Predicate<T>)predicate;
+     }
+@@ -325,19 +_,6 @@
+         return input -> predicate1.test(input) && predicate2.test(input) && predicate3.test(input) && predicate4.test(input) && predicate5.test(input);
+     }
+ 
+-    @SafeVarargs
+-    public static <T> Predicate<T> allOf(Predicate<? super T>... predicates) {
+-        return input -> {
+-            for (Predicate<? super T> predicate : predicates) {
+-                if (!predicate.test(input)) {
+-                    return false;
+-                }
+-            }
+-
+-            return true;
+-        };
+-    }
+-
+     public static <T> Predicate<T> allOf(List<? extends Predicate<? super T>> predicates) {
+         return switch (predicates.size()) {
+             case 0 -> allOf();
+@@ -368,6 +_,19 @@
+         return input -> false;
+     }
+ 
++    @SafeVarargs
++    public static <T> Predicate<T> anyOf(Predicate<? super T>... predicates) {
++        return input -> {
++            for (Predicate<? super T> predicate : predicates) {
++                if (predicate.test(input)) {
++                    return true;
++                }
++            }
++
++            return false;
++        };
++    }
++
+     public static <T> Predicate<T> anyOf(Predicate<? super T> predicate) {
+         return (Predicate<T>)predicate;
+     }
+@@ -394,19 +_,6 @@
+         Predicate<? super T> predicate5
+     ) {
+         return input -> predicate1.test(input) || predicate2.test(input) || predicate3.test(input) || predicate4.test(input) || predicate5.test(input);
+-    }
+-
+-    @SafeVarargs
+-    public static <T> Predicate<T> anyOf(Predicate<? super T>... predicates) {
+-        return input -> {
+-            for (Predicate<? super T> predicate : predicates) {
+-                if (predicate.test(input)) {
+-                    return true;
+-                }
+-            }
+-
+-            return false;
+-        };
+     }
+ 
+     public static <T> Predicate<T> anyOf(List<? extends Predicate<? super T>> predicates) {

paper-server/patches/sources/net/minecraft/advancements/AdvancementTree.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/advancements/AdvancementTree.java
 +++ b/net/minecraft/advancements/AdvancementTree.java
-@@ -26,7 +_,7 @@
+@@ -25,7 +_,7 @@
              this.remove(advancementNode);
          }
 
@@ -9,7 +9,7 @@
          this.nodes.remove(node.holder().id());
          if (node.parent() == null) {
              this.roots.remove(node);
-@@ -62,7 +_,7 @@
+@@ -61,7 +_,7 @@
              }
          }
 

paper-server/patches/sources/net/minecraft/commands/CommandSourceStack.java.patch

@@ -1,23 +1,23 @@
 --- a/net/minecraft/commands/CommandSourceStack.java
 +++ b/net/minecraft/commands/CommandSourceStack.java
 @@ -48,7 +_,7 @@
- import net.minecraft.world.phys.Vec2;
  import net.minecraft.world.phys.Vec3;
+ import org.jspecify.annotations.Nullable;
 
 -public class CommandSourceStack implements ExecutionCommandSource<CommandSourceStack>, SharedSuggestionProvider {
 +public class CommandSourceStack implements ExecutionCommandSource<CommandSourceStack>, SharedSuggestionProvider, io.papermc.paper.command.brigadier.PaperCommandSourceStack { // Paper - Brigadier API
      public static final SimpleCommandExceptionType ERROR_NOT_PLAYER = new SimpleCommandExceptionType(Component.translatable("permissions.requires.player"));
      public static final SimpleCommandExceptionType ERROR_NOT_ENTITY = new SimpleCommandExceptionType(Component.translatable("permissions.requires.entity"));
      public final CommandSource source;
-@@ -66,6 +_,7 @@
+@@ -65,6 +_,7 @@
      private final Vec2 rotation;
      private final CommandSigningContext signingContext;
      private final TaskChainer chatMessageChainer;
 +    public boolean bypassSelectorPermissions = false; // Paper - add bypass for selector permissions
 
      public CommandSourceStack(
          CommandSource source,
-@@ -191,6 +_,30 @@
+@@ -190,6 +_,30 @@
              );
      }
 
@@ -48,7 +48,7 @@
      public CommandSourceStack withRotation(Vec2 rotation) {
          return this.rotation.equals(rotation)
              ? this
-@@ -380,6 +_,32 @@
+@@ -379,6 +_,32 @@
          return this.permissions;
      }
 
@@ -81,9 +81,9 @@
      public Vec3 getPosition() {
          return this.worldPosition;
      }
-@@ -485,20 +_,25 @@
+@@ -482,20 +_,25 @@
          GameRules gameRules = this.level.getGameRules();
-         if (gameRules.getBoolean(GameRules.RULE_SENDCOMMANDFEEDBACK)) {
+         if (gameRules.get(GameRules.SEND_COMMAND_FEEDBACK)) {
              for (ServerPlayer serverPlayer : this.server.getPlayerList().getPlayers()) {
 -                if (serverPlayer.commandSource() != this.source && this.server.getPlayerList().isOp(serverPlayer.nameAndId())) {
 +                if (serverPlayer.commandSource() != this.source && serverPlayer.getBukkitEntity().hasPermission("minecraft.admin.command_feedback")) { // CraftBukkit
@@ -92,8 +92,8 @@
              }
          }
 
--        if (this.source != this.server && gameRules.getBoolean(GameRules.RULE_LOGADMINCOMMANDS)) {
-+        if (this.source != this.server && gameRules.getBoolean(GameRules.RULE_LOGADMINCOMMANDS) && !org.spigotmc.SpigotConfig.silentCommandBlocks) { // Spigot
+-        if (this.source != this.server && gameRules.get(GameRules.LOG_ADMIN_COMMANDS)) {
++        if (this.source != this.server && gameRules.get(GameRules.LOG_ADMIN_COMMANDS) && !org.spigotmc.SpigotConfig.silentCommandBlocks) { // Spigot
              this.server.sendSystemMessage(component);
          }
      }
@@ -110,7 +110,7 @@
          }
      }
 
-@@ -509,7 +_,7 @@
+@@ -506,7 +_,7 @@
 
      @Override
      public Collection<String> getOnlinePlayerNames() {
@@ -119,7 +119,7 @@
      }
 
      @Override
-@@ -589,4 +_,16 @@
+@@ -586,4 +_,16 @@
      public boolean isSilent() {
          return this.silent;
      }

paper-server/patches/sources/net/minecraft/commands/Commands.java.patch

@@ -6,17 +6,17 @@
  public class Commands {
 +    public interface RestrictedMarker { } // Paper - restricted api
      public static final String COMMAND_PREFIX = "/";
-     private static final ThreadLocal<ExecutionContext<CommandSourceStack>> CURRENT_EXECUTION_CONTEXT = new ThreadLocal<>();
+     private static final ThreadLocal<@Nullable ExecutionContext<CommandSourceStack>> CURRENT_EXECUTION_CONTEXT = new ThreadLocal<>();
      private static final Logger LOGGER = LogUtils.getLogger();
-@@ -180,6 +_,7 @@
+@@ -179,6 +_,7 @@
 
          @Override
          public boolean isRestricted(CommandNode<CommandSourceStack> node) {
 +            if (node.getRequirement() instanceof RestrictedMarker) return true; // Paper - restricted api
              Predicate<CommandSourceStack> requirement = node.getRequirement();
              return !requirement.test(this.noPermissionSource);
          }
-@@ -187,6 +_,11 @@
+@@ -186,6 +_,11 @@
      private final CommandDispatcher<CommandSourceStack> dispatcher = new CommandDispatcher<>();
 
      public Commands(Commands.CommandSelection selection, CommandBuildContext context) {
@@ -28,7 +28,7 @@
          AdvancementCommands.register(this.dispatcher);
          AttributeCommand.register(this.dispatcher, context);
          ExecuteCommand.register(this.dispatcher, context);
-@@ -297,6 +_,42 @@
+@@ -296,6 +_,42 @@
              PublishCommand.register(this.dispatcher);
          }
 
@@ -71,7 +71,7 @@
          this.dispatcher.setConsumer(ExecutionCommandSource.resultConsumer());
      }
 
-@@ -316,6 +_,13 @@
+@@ -315,6 +_,13 @@
      }
 
      public void performCommand(ParseResults<CommandSourceStack> parseResults, String command) {
@@ -85,7 +85,7 @@
          CommandSourceStack commandSourceStack = parseResults.getContext().getSource();
          Profiler.get().push(() -> "/" + command);
          ContextChain<CommandSourceStack> contextChain = finishParsing(parseResults, command, commandSourceStack);
-@@ -329,10 +_,13 @@
+@@ -328,10 +_,13 @@
                      )
                  );
              }
@@ -102,14 +102,17 @@
                  StackTraceElement[] stackTrace = var12.getStackTrace();
 
                  for (int i = 0; i < Math.min(stackTrace.length, 3); i++) {
-@@ -358,13 +_,17 @@
+@@ -356,7 +_,8 @@
+         }
      }
 
-     @Nullable
--    private static ContextChain<CommandSourceStack> finishParsing(ParseResults<CommandSourceStack> parseResults, String command, CommandSourceStack source) {
-+    private ContextChain<CommandSourceStack> finishParsing(ParseResults<CommandSourceStack> parseResults, String command, CommandSourceStack source) {
+-    private static @Nullable ContextChain<CommandSourceStack> finishParsing(
++    
++    private ContextChain<CommandSourceStack> finishParsing(
+         ParseResults<CommandSourceStack> parseResults, String command, CommandSourceStack source
+     ) {
          try {
-             validateParseResults(parseResults);
+@@ -364,7 +_,11 @@
              return ContextChain.tryFlatten(parseResults.getContext().build(command))
                  .orElseThrow(() -> CommandSyntaxException.BUILT_IN_EXCEPTIONS.dispatcherUnknownCommand().createWithContext(parseResults.getReader()));
          } catch (CommandSyntaxException var7) {