Even more cleanup of mcutil patch

patches/server/Add-Lifecycle-Event-system.patch

@@ -734,22 +734,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          org.spigotmc.WatchdogThread.hasStarted = false; // Paper - Disable watchdog early timeout on reload
          this.reloadCount++;
          this.configuration = YamlConfiguration.loadConfiguration(this.getConfigFile());
-diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/MinecraftInternalPlugin.java b/src/main/java/org/bukkit/craftbukkit/scheduler/MinecraftInternalPlugin.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/craftbukkit/scheduler/MinecraftInternalPlugin.java
-+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/MinecraftInternalPlugin.java
-@@ -0,0 +0,0 @@ public class MinecraftInternalPlugin extends PluginBase {
-     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-         throw new UnsupportedOperationException("Not supported.");
-     }
-+
-+    // Paper start - lifecycle events
-+    @Override
-+    public @NotNull io.papermc.paper.plugin.lifecycle.event.LifecycleEventManager<org.bukkit.plugin.Plugin> getLifecycleManager() {
-+        throw new UnsupportedOperationException("Not supported.");
-+    }
-+    // Paper end - lifecycle events
- }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java

patches/server/Add-debug-for-sync-chunk-loads.patch

@@ -31,6 +31,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import java.util.List;
 +import java.util.Map;
 +import java.util.WeakHashMap;
++import net.minecraft.world.level.ChunkPos;
 +import net.minecraft.world.level.Level;
 +
 +public class SyncLoadFinder {
@@ -69,7 +70,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +                ++valueInMap.times;
 +
-+                valueInMap.coordinateTimes.compute(io.papermc.paper.util.MCUtil.getCoordinateKey(chunkX, chunkZ), (Long keyInMap1, Integer valueInMap1) -> {
++                valueInMap.coordinateTimes.compute(ChunkPos.asLong(chunkX, chunkZ), (Long keyInMap1, Integer valueInMap1) -> {
 +                    return valueInMap1 == null ? Integer.valueOf(1) : Integer.valueOf(valueInMap1.intValue() + 1);
 +                });
 +
@@ -122,7 +123,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                for (Long2IntMap.Entry coordinate : pair.getSecond().coordinateTimes.long2IntEntrySet()) {
 +                    final long key = coordinate.getLongKey();
 +                    final int times = coordinate.getIntValue();
-+                    coordinates.add("(" + io.papermc.paper.util.MCUtil.getCoordinateX(key) + "," + io.papermc.paper.util.MCUtil.getCoordinateZ(key) + "): " + times);
++                    final ChunkPos chunkPos = new ChunkPos(key);
++                    coordinates.add("(" + chunkPos.x + "," + chunkPos.z + "): " + times);
 +                }
 +
 +                stacktrace.add("coordinates", coordinates);

patches/server/Add-exception-reporting-event.patch

@@ -175,15 +175,28 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
-                             msg,
+                 try {
+                     task.run();
+                 } catch (final Throwable throwable) {
++                    // Paper start
++                    final String logMessage = String.format(
++                        "Task #%s for %s generated an exception",
++                        task.getTaskId(),
++                        task.getOwner().getDescription().getFullName());
+                     task.getOwner().getLogger().log(
+                             Level.WARNING,
+-                            String.format(
+-                                "Task #%s for %s generated an exception",
+-                                task.getTaskId(),
+-                                task.getOwner().getDescription().getFullName()),
++                        logMessage,
                              throwable);
-                     }
 +                    org.bukkit.Bukkit.getServer().getPluginManager().callEvent(
-+                        new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerSchedulerException(msg, throwable, task)));
++                        new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerSchedulerException(logMessage, throwable, task)));
-                     // Paper end
++                    // Paper end
                  } finally {
                      this.currentTask = null;
-@@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
+                 }
                  this.parsePending();
              } else {
                  this.debugTail = this.debugTail.setNext(new CraftAsyncDebugger(currentTick + CraftScheduler.RECENT_TICKS, task.getOwner(), task.getTaskClass()));

patches/server/Basic-PlayerProfile-API.patch

@@ -558,37 +558,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +    @NotNull GameProfile buildGameProfile();
 +}
-diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/io/papermc/paper/util/MCUtil.java
-+++ b/src/main/java/io/papermc/paper/util/MCUtil.java
-@@ -0,0 +0,0 @@
- package io.papermc.paper.util;
- 
-+import com.destroystokyo.paper.profile.CraftPlayerProfile;
-+import com.destroystokyo.paper.profile.PlayerProfile;
- import com.google.common.collect.ImmutableList;
- import com.google.common.util.concurrent.ThreadFactoryBuilder;
- import io.papermc.paper.math.BlockPosition;
-@@ -0,0 +0,0 @@ import net.minecraft.world.level.ClipContext;
- import net.minecraft.world.level.Level;
- import net.minecraft.world.phys.Vec3;
- import org.apache.commons.lang.exception.ExceptionUtils;
-+import com.mojang.authlib.GameProfile;
- import org.bukkit.Location;
- import org.bukkit.block.BlockFace;
- import org.bukkit.craftbukkit.CraftWorld;
-@@ -0,0 +0,0 @@ public final class MCUtil {
-         return run.get();
-     }
- 
-+    public static PlayerProfile toBukkit(GameProfile profile) {
-+        return CraftPlayerProfile.asBukkitMirror(profile);
-+    }
-+
-     /**
-      * Calculates distance between 2 entities
-      * @param e1
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/Main.java

patches/server/Entity-Activation-Range-2.0.patch

@@ -175,13 +175,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/world/entity/PathfinderMob.java
 +++ b/src/main/java/net/minecraft/world/entity/PathfinderMob.java
 @@ -0,0 +0,0 @@ public abstract class PathfinderMob extends Mob {
+         super(type, world);
      }
  
-     public org.bukkit.craftbukkit.entity.CraftCreature getBukkitCreature() { return (org.bukkit.craftbukkit.entity.CraftCreature) super.getBukkitEntity(); } // Paper
++    public BlockPos movingTarget; public BlockPos getMovingTarget() { return movingTarget; } // Paper
-+    public BlockPos movingTarget = null; public BlockPos getMovingTarget() { return movingTarget; } // Paper
++
- 
      public float getWalkTargetValue(BlockPos pos) {
          return this.getWalkTargetValue(pos, this.level());
+     }
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java

patches/server/Fix-SpawnEggMeta-get-setSpawnedType.patch

@@ -17,8 +17,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    public EntityType getCustomSpawnedType() {
 +        return java.util.Optional.ofNullable(this.entityTag)
 +            .map(tag -> tag.getString(ENTITY_ID.NBT))
-+            .flatMap(net.minecraft.world.entity.EntityType::byString)
++            .map(net.minecraft.resources.ResourceLocation::tryParse)
-+            .map(org.bukkit.craftbukkit.util.CraftMagicNumbers::getEntityType)
++            .map(key -> key.getNamespace().equals("minecraft") ? EntityType.fromName(key.getPath()) : null)
 +            .orElse(null);
 +    }
 +

patches/server/Mob-Pathfinding-API.patch

@@ -40,7 +40,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +    @Override
 +    public Mob getEntity() {
-+        return entity.getBukkitMob();
++        return (Mob) entity.getBukkitEntity();
 +    }
 +
 +    public void setHandle(net.minecraft.world.entity.Mob entity) {

patches/server/Moonrise-optimisation-patches.patch

@@ -23167,25 +23167,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      @FunctionalInterface
-@@ -0,0 +0,0 @@ public class ChunkHolder extends GenerationChunkHolder {
- 
-     // Paper start
-     public final boolean isEntityTickingReady() {
--        return this.isEntityTickingReady;
-+        throw new UnsupportedOperationException(); // Paper - rewrite chunk system
-     }
- 
-     public final boolean isTickingReady() {
--        return this.isTickingReady;
-+        throw new UnsupportedOperationException(); // Paper - rewrite chunk system
-     }
- 
-     public final boolean isFullChunkReady() {
--        return this.isFullChunkReady;
-+        throw new UnsupportedOperationException(); // Paper - rewrite chunk system
-     }
-     // Paper end
- }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkLevel.java b/src/main/java/net/minecraft/server/level/ChunkLevel.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkLevel.java
@@ -24206,7 +24187,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    public class ChunkDistanceManager extends DistanceManager implements ca.spottedleaf.moonrise.patches.chunk_system.level.chunk.ChunkSystemDistanceManager { // Paper - public // Paper - rewrite chunk system
  
          protected ChunkDistanceManager(final Executor workerExecutor, final Executor mainThreadExecutor) {
-             super(workerExecutor, mainThreadExecutor, ChunkMap.this); // Paper
+             super(workerExecutor, mainThreadExecutor);
          }
  
 +        // Paper start - rewrite chunk system
@@ -24349,39 +24330,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private long ticketTickCounter;
 -    public int simulationDistance = 10;
 +    // Paper - rewrite chunk system
-     private final ChunkMap chunkMap; // Paper
  
-+    // Paper start - rewrite chunk system
+     protected DistanceManager(Executor workerExecutor, Executor mainThreadExecutor) {
-+    public ca.spottedleaf.moonrise.patches.chunk_system.scheduling.ChunkHolderManager getChunkHolderManager() {
-+        return ((ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemServerLevel)this.moonrise$getChunkMap().level).moonrise$getChunkTaskScheduler().chunkHolderManager;
-+    }
-+    // Paper end - rewrite chunk system
-+    // Paper start - chunk tick iteration optimisation
-+    private final ca.spottedleaf.moonrise.common.misc.PositionCountingAreaMap<ServerPlayer> spawnChunkTracker = new ca.spottedleaf.moonrise.common.misc.PositionCountingAreaMap<>();
-+
-+    @Override
-+    public final void moonrise$addPlayer(final ServerPlayer player, final SectionPos pos) {
-+        this.spawnChunkTracker.add(player, pos.x(), pos.z(), ca.spottedleaf.moonrise.patches.chunk_tick_iteration.ChunkTickConstants.PLAYER_SPAWN_TRACK_RANGE);
-+    }
-+
-+    @Override
-+    public final void moonrise$removePlayer(final ServerPlayer player, final SectionPos pos) {
-+        this.spawnChunkTracker.remove(player);
-+    }
-+
-+    @Override
-+    public final void moonrise$updatePlayer(final ServerPlayer player,
-+                                            final SectionPos oldPos, final SectionPos newPos,
-+                                            final boolean oldIgnore, final boolean newIgnore) {
-+        if (newIgnore) {
-+            this.spawnChunkTracker.remove(player);
-+        } else {
-+            this.spawnChunkTracker.addOrUpdate(player, newPos.x(), newPos.z(), ca.spottedleaf.moonrise.patches.chunk_tick_iteration.ChunkTickConstants.PLAYER_SPAWN_TRACK_RANGE);
-+        }
-+    }
-+    // Paper end - chunk tick iteration optimisation
-+
-     protected DistanceManager(Executor workerExecutor, Executor mainThreadExecutor, ChunkMap chunkMap) {
          Objects.requireNonNull(mainThreadExecutor);
          ProcessorHandle<Runnable> mailbox = ProcessorHandle.of("player ticket throttler", mainThreadExecutor::execute);
          ChunkTaskPriorityQueueSorter chunktaskqueuesorter = new ChunkTaskPriorityQueueSorter(ImmutableList.of(mailbox), workerExecutor, 4);
@@ -24391,10 +24341,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -        this.ticketThrottlerReleaser = chunktaskqueuesorter.getReleaseProcessor(mailbox);
 -        this.mainThreadExecutor = mainThreadExecutor;
 +        // Paper - rewrite chunk system
-         this.chunkMap = chunkMap; // Paper
      }
  
-     protected void purgeStaleTickets() {
+-    protected void purgeStaleTickets() {
 -        ++this.ticketTickCounter;
 -        ObjectIterator<Entry<SortedArraySet<Ticket<?>>>> objectiterator = this.tickets.long2ObjectEntrySet().fastIterator();
 -
@@ -24405,22 +24354,49 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -
 -            while (iterator.hasNext()) {
 -                Ticket<?> ticket = (Ticket) iterator.next();
--
++    // Paper start - rewrite chunk system
++    public ca.spottedleaf.moonrise.patches.chunk_system.scheduling.ChunkHolderManager getChunkHolderManager() {
++        return ((ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemServerLevel)this.moonrise$getChunkMap().level).moonrise$getChunkTaskScheduler().chunkHolderManager;
++    }
++    // Paper end - rewrite chunk system
++    // Paper start - chunk tick iteration optimisation
++    private final ca.spottedleaf.moonrise.common.misc.PositionCountingAreaMap<ServerPlayer> spawnChunkTracker = new ca.spottedleaf.moonrise.common.misc.PositionCountingAreaMap<>();
+ 
 -                if (ticket.timedOut(this.ticketTickCounter)) {
 -                    iterator.remove();
 -                    flag = true;
 -                    this.tickingTicketsTracker.removeTicket(entry.getLongKey(), ticket);
 -                }
 -            }
--
++    @Override
++    public final void moonrise$addPlayer(final ServerPlayer player, final SectionPos pos) {
++        this.spawnChunkTracker.add(player, pos.x(), pos.z(), ca.spottedleaf.moonrise.patches.chunk_tick_iteration.ChunkTickConstants.PLAYER_SPAWN_TRACK_RANGE);
++    }
+ 
 -            if (flag) {
 -                this.ticketTracker.update(entry.getLongKey(), DistanceManager.getTicketLevelAt((SortedArraySet) entry.getValue()), false);
 -            }
--
++    @Override
++    public final void moonrise$removePlayer(final ServerPlayer player, final SectionPos pos) {
++        this.spawnChunkTracker.remove(player);
++    }
+ 
 -            if (((SortedArraySet) entry.getValue()).isEmpty()) {
 -                objectiterator.remove();
 -            }
--        }
++    @Override
++    public final void moonrise$updatePlayer(final ServerPlayer player,
++                                            final SectionPos oldPos, final SectionPos newPos,
++                                            final boolean oldIgnore, final boolean newIgnore) {
++        if (newIgnore) {
++            this.spawnChunkTracker.remove(player);
++        } else {
++            this.spawnChunkTracker.addOrUpdate(player, newPos.x(), newPos.z(), ca.spottedleaf.moonrise.patches.chunk_tick_iteration.ChunkTickConstants.PLAYER_SPAWN_TRACK_RANGE);
+         }
++    }
++    // Paper end - chunk tick iteration optimisation
++
++    protected void purgeStaleTickets() {
 +        this.getChunkHolderManager().tick(); // Paper - rewrite chunk system
  
      }

patches/server/Paper-Plugins.patch

@@ -7328,23 +7328,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          this.loadPlugins();
          this.enablePlugins(PluginLoadOrder.STARTUP);
          this.enablePlugins(PluginLoadOrder.POSTWORLD);
-diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/MinecraftInternalPlugin.java b/src/main/java/org/bukkit/craftbukkit/scheduler/MinecraftInternalPlugin.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/craftbukkit/scheduler/MinecraftInternalPlugin.java
-+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/MinecraftInternalPlugin.java
-@@ -0,0 +0,0 @@ public class MinecraftInternalPlugin extends PluginBase {
-     public PluginDescriptionFile getDescription() {
-         return pdf;
-     }
-+    // Paper start
-+    @Override
-+    public io.papermc.paper.plugin.configuration.PluginMeta getPluginMeta() {
-+        return pdf;
-+    }
-+    // Paper end
- 
-     @Override
-     public FileConfiguration getConfig() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java

patches/server/ProfileWhitelistVerifyEvent.patch

@@ -33,7 +33,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        boolean isOp = this.ops.contains(gameprofile);
 +        boolean isWhitelisted = !this.doWhiteList || isOp || this.whitelist.contains(gameprofile);
 +        final com.destroystokyo.paper.event.profile.ProfileWhitelistVerifyEvent event;
-+        event = new com.destroystokyo.paper.event.profile.ProfileWhitelistVerifyEvent(io.papermc.paper.util.MCUtil.toBukkit(gameprofile), this.doWhiteList, isWhitelisted, isOp, org.spigotmc.SpigotConfig.whitelistMessage);
++
++        event = new com.destroystokyo.paper.event.profile.ProfileWhitelistVerifyEvent(com.destroystokyo.paper.profile.CraftPlayerProfile.asBukkitMirror(gameprofile), this.doWhiteList, isWhitelisted, isOp, org.spigotmc.SpigotConfig.whitelistMessage);
 +        event.callEvent();
 +        if (!event.isWhitelisted()) {
 +            if (loginEvent != null) {

patches/server/Timings-v2.patch

@@ -1833,16 +1833,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import com.google.common.base.Preconditions;
  import com.google.common.util.concurrent.ThreadFactoryBuilder;
  import java.util.ArrayList;
-@@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
-     }
- 
-     public BukkitTask scheduleInternalTask(Runnable run, int delay, String taskName) {
--        final CraftTask task = new CraftTask(run, nextId(), taskName);
-+        final CraftTask task = new CraftTask(run, nextId(), "Internal - " + (taskName != null ? taskName : "Unknown"));
-+        task.internal = true;
-         return handle(task, delay);
-     }
- 
 @@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
                          }
                          return false;
@@ -1869,8 +1859,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                      task.run();
 -                    task.timings.stopTiming(); // Spigot
                  } catch (final Throwable throwable) {
-                     // Paper start
+                     task.getOwner().getLogger().log(
-                     String msg = String.format(
+                             Level.WARNING,
 @@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
                  this.runners.remove(task.getTaskId());
              }
@@ -1936,15 +1926,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      CraftTask() {
          this(null, null, CraftTask.NO_REPEATING, CraftTask.NO_REPEATING);
      }
-@@ -0,0 +0,0 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
-         this.id = id;
-         this.period = CraftTask.NO_REPEATING;
-         this.taskName = taskName;
--        this.timings = null; // Will be changed in later patch
-+        this.timings = MinecraftTimings.getInternalTaskName(taskName);
-     }
-     // Paper end
- 
 @@ -0,0 +0,0 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
          }
          this.id = id;
@@ -2008,8 +1989,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -0,0 +0,0 @@ public final class CraftMagicNumbers implements UnsafeValues {
+         return CraftNamespacedKey.toMinecraft(mat.getKey());
      }
-     // Paper end
      // ========================================================================
 +    // Paper start
 +    @Override