fix old config removal

Author: kennytv

paper-api/src/main/java/org/bukkit/event/world/ClockTimeSkipEvent.java

@@ -4,7 +4,7 @@
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Called when the time skips for a world clock.
@@ -13,6 +13,7 @@
  */
 // TODO - snapshot - 26.1 clock
 @ApiStatus.Experimental
+@NullMarked
 public class ClockTimeSkipEvent extends Event implements Cancellable {
 
     private static final HandlerList HANDLER_LIST = new HandlerList();
@@ -23,7 +24,7 @@ public class ClockTimeSkipEvent extends Event implements Cancellable {
     private boolean cancelled;
 
     @ApiStatus.Internal
-    public ClockTimeSkipEvent(@NotNull SkipReason skipReason, long skipAmount) {
+    public ClockTimeSkipEvent(final SkipReason skipReason, final long skipAmount) {
         this.skipReason = skipReason;
         this.skipAmount = skipAmount;
     }
@@ -33,7 +34,6 @@ public ClockTimeSkipEvent(@NotNull SkipReason skipReason, long skipAmount) {
      *
      * @return a SkipReason value detailing why the time has skipped
      */
-    @NotNull
     public SkipReason getSkipReason() {
         return this.skipReason;
     }
@@ -66,13 +66,11 @@ public void setCancelled(boolean cancel) {
         this.cancelled = cancel;
     }
 
-    @NotNull
     @Override
     public HandlerList getHandlers() {
         return HANDLER_LIST;
     }
 
-    @NotNull
     public static HandlerList getHandlerList() {
         return HANDLER_LIST;
     }

paper-server/patches/features/0001-Moonrise-optimisation-patches.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Incremental chunk and player saving
 
 
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 1e88021d476710cf4fce9bf50c02993e076e36ee..8c4b40362f77cdea6e57315a6639006ac7ab27c7 100644
+index 248a01f06ec822737a741873166aa4e502a7ba07..c4eb56fc227afd7e9631624537dd8e67ae3a8bea 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -968,7 +968,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -94,10 +94,10 @@ index 1e88021d476710cf4fce9bf50c02993e076e36ee..8c4b40362f77cdea6e57315a6639006a
          ProfilerFiller profiler = Profiler.get();
          this.server.spark.executeMainThreadTasks(); // Paper - spark
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index ffe3ae41dd3d8c4141f81edf0b92001db957ebac..98461e8468a7eeaef2544ee907ff64de1fd42a49 100644
+index 12e6162e82dd639ac34da6466fc201623f4682c5..179014dc4a7b99f7292f6255f0430503267faa76 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -1441,6 +1441,15 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
+@@ -1448,6 +1448,15 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
      public boolean mayInteract(final Entity entity, final BlockPos pos) {
          return !(entity instanceof Player player && (this.server.isUnderSpawnProtection(this, pos, player) || !this.getWorldBorder().isWithinBounds(pos)));
      }
@@ -126,7 +126,7 @@ index 41816ca8d4ef3d959d2b88cd4b2eedaaa541e612..82e87270d1ad89ad7aa56e028ced6b99
      private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
      private static final int FLY_STAT_RECORDING_SPEED = 25;
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index b928b58ea5f0b4268b999ce4a23fe2fbc3042f4e..f06f60e4e20a92085bca7955993b2eb0ce443872 100644
+index 02605ebe6ef10727badadbf7fc4cec52583df965..3d62e4d275f32c8604a1bdaefb6b9b1d4ea6e21f 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -418,6 +418,7 @@ public abstract class PlayerList {

paper-server/patches/features/0020-Incremental-chunk-and-player-saving.patch

@@ -48,10 +48,10 @@ index 0000000000000000000000000000000000000000..24a2090e068ad3c0d08705050944abdf
 +    }
 +}
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index a5217deb236ee922d020a7a6a03141a5f67acd77..4fdf7354bc01789cf7480b14c2fc8fe75b748563 100644
+index af1f5e83bd24e671399af2a9aadc8e11959ec5f4..b9efed1df74651c894a416f1d3db320d4ab20401 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1846,6 +1846,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1850,6 +1850,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              level.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - BlockPhysicsEvent
              level.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent
              level.updateLagCompensationTick(); // Paper - lag compensation

paper-server/patches/features/0029-Optimize-Hoppers.patch

@@ -47,7 +47,7 @@
 -        return totalTicks;
 +        ServerClockManager clockManager = source.getLevel().clockManager();
 +        long currentTotalTicks = clockManager.getTotalTicks(clock);
-+        org.bukkit.event.world.ClockTimeSkipEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callTimeSkipEvent(source, totalTicks - currentTotalTicks);
++        org.bukkit.event.world.ClockTimeSkipEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.createTimeSkipEvent(source, totalTicks - currentTotalTicks);
 +        final long newTotalTicks;
 +        if (event.callEvent()) {
 +            newTotalTicks = currentTotalTicks + event.getSkipAmount();
@@ -63,7 +63,7 @@
 -        ServerClockManager clockManager = source.getServer().clockManager();
 -        clockManager.addTicks(clock, time);
 +        ServerClockManager clockManager = source.getLevel().clockManager();
-+        org.bukkit.event.world.ClockTimeSkipEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callTimeSkipEvent(source, time);
++        org.bukkit.event.world.ClockTimeSkipEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.createTimeSkipEvent(source, time);
 +        if (event.callEvent()) {
 +            clockManager.addTicks(clock, event.getSkipAmount());
 +        }
@@ -82,7 +82,7 @@
              throw ERROR_NO_TIME_MARKER_FOUND.create(clock.getRegisteredName(), timeMarkerId);
          } else {
 +            final long currentTime = clockManager.getTotalTicks(clock);
-+            final org.bukkit.event.world.ClockTimeSkipEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callTimeSkipEvent(source, targetTime.getAsLong() - currentTime);
++            final org.bukkit.event.world.ClockTimeSkipEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.createTimeSkipEvent(source, targetTime.getAsLong() - currentTime);
 +            if (event.callEvent()) {
 +                clockManager.setTotalTicks(clock, currentTime + event.getSkipAmount());
 +            }

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

@@ -4,7 +4,7 @@
      );
      private final PackedClockStates packedClockStates;
      private MinecraftServer server;
-+    private @org.checkerframework.checker.nullness.qual.Nullable ServerLevel level; // Paper - per-world time
++    private @org.jspecify.annotations.Nullable ServerLevel level; // Paper - per-world time
      private final Map<Holder<WorldClock>, ServerClockManager.ClockInstance> clocks = new HashMap<>();
 
      private ServerClockManager(final PackedClockStates packedClockStates) {
@@ -15,7 +15,7 @@
 +        // Paper start - per-world time
 +        this.init(server, null);
 +    }
-+    public void init(final MinecraftServer server, @org.checkerframework.checker.nullness.qual.Nullable final ServerLevel level) {
++    public void init(final MinecraftServer server, @org.jspecify.annotations.Nullable final ServerLevel level) {
 +        this.level = level;
 +        // Paper end - per-world time
          this.server = server;

paper-server/patches/sources/net/minecraft/world/clock/ServerClockManager.java.patch

@@ -29,7 +29,7 @@
 @SuppressWarnings({"CanBeFinal", "FieldCanBeLocal", "FieldMayBeFinal", "NotNullFieldNotInitialized", "InnerClassMayBeStatic"})
 public class GlobalConfiguration extends ConfigurationPart {
     private static final Logger LOGGER = LogUtils.getLogger();
-    static final int CURRENT_VERSION = 32; // (when you change the version, change the comment, so it conflicts on rebases): rename all-worlds time config
+    static final int CURRENT_VERSION = 31; // (when you change the version, change the comment, so it conflicts on rebases): allow-nether property to config
     private static GlobalConfiguration instance;
     public static boolean isFirstStart = false;
     public static GlobalConfiguration get() {

paper-server/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java

@@ -58,8 +58,7 @@ interface RemovedConfigurations {
         path("misc", "light-queue-size"),
         path("spawn", "keep-spawn-loaded"),
         path("spawn", "keep-spawn-loaded-range"),
-        path("misc", "shield-blocking-delay"),
-        path("command", "time-command-affects-all-worlds")
+        path("misc", "shield-blocking-delay")
     };
 
     NodePath[] REMOVED_GLOBAL_PATHS = {
@@ -88,6 +87,7 @@ interface RemovedConfigurations {
         path("chunk-system", "gen-parallelism"),
         path("logging"), // server is no longer obfuscated since 26.1
         path("unsupported-settings", "compression-format"),
+        path("commands", "time-command-affects-all-worlds") // replaced with time.affects-all-worlds
     };
 
 }

paper-server/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java

@@ -2421,7 +2421,7 @@ public static boolean callPlayerToggleEntityAgeLockEvent(net.minecraft.world.ent
         return true;
     }
 
-    public static ClockTimeSkipEvent callTimeSkipEvent(final CommandSourceStack source, final long skipAmount) {
+    public static ClockTimeSkipEvent createTimeSkipEvent(final CommandSourceStack source, final long skipAmount) {
         if (io.papermc.paper.configuration.GlobalConfiguration.get().time.affectsAllWorlds) {
             return new ClockTimeSkipEvent(ClockTimeSkipEvent.SkipReason.COMMAND, skipAmount);
         }