Fix javadoc errors, remove unused classes

patches/server/CB-fixes.patch

@@ -114,6 +114,26 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  this.acceptsAll(Main.asList("nogui"), "Disables the graphical console");
  
                  this.acceptsAll(Main.asList("nojline"), "Disables jline and emulates the vanilla console");
+diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
++++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+@@ -0,0 +0,0 @@ import org.bukkit.scheduler.BukkitWorker;
+ 
+ /**
+  * The fundamental concepts for this implementation:
++ * <ul>
+  * <li>Main thread owns {@link #head} and {@link #currentTick}, but it may be read from any thread</li>
+  * <li>Main thread exclusively controls {@link #temp} and {@link #pending}.
+  *     They are never to be accessed outside of the main thread; alternatives exist to prevent locking.</li>
+@@ -0,0 +0,0 @@ import org.bukkit.scheduler.BukkitWorker;
+  * <li>Sync tasks are only to be removed from runners on the main thread when coupled with a removal from pending and temp.</li>
+  * <li>Most of the design in this scheduler relies on queuing special tasks to perform any data changes on the main thread.
+  *     When executed from inside a synchronous method, the scheduler will be updated before next execution by virtue of the frequent {@link #parsePending()} calls.</li>
++ * </ul>
+  */
+ public class CraftScheduler implements BukkitScheduler {
+ 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java b/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java

patches/server/Collision-optimisations.patch

@@ -2799,10 +2799,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        }
 +    }
 +
-+    /**
-+     * @reason Route to optimized call
-+     * @author Spottedleaf
-+     */
 +    @Override
 +    public final net.minecraft.world.phys.BlockHitResult clip(final ClipContext clipContext) {
 +        // can only do this in this class, as not everything that implements BlockGetter can retrieve chunks

patches/server/ConcurrentUtil.patch

@@ -3724,7 +3724,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    /**
 +     * Constructs this map with the specified capacity and load factor.
 +     * @param capacity specified capacity, > 0
-+     * @param loadFactor specified load factor, > 0 && finite
++     * @param loadFactor specified load factor, > 0 and finite
 +     */
 +    public SWMRHashTable(final int capacity, final float loadFactor) {
 +        final int tableSize = getCapacityFor(capacity);
@@ -3772,7 +3772,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * with the specified load factor.
 +     * All of the specified map's entries are copied into this map.
 +     * @param capacity specified capacity, > 0
-+     * @param loadFactor specified load factor, > 0 && finite
++     * @param loadFactor specified load factor, > 0 and finite
 +     * @param other The specified map.
 +     */
 +    public SWMRHashTable(final int capacity, final float loadFactor, final Map<K, V> other) {
@@ -5370,7 +5370,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    /**
 +     * Constructs this map with the specified capacity and load factor.
 +     * @param capacity specified capacity, > 0
-+     * @param loadFactor specified load factor, > 0 && finite
++     * @param loadFactor specified load factor, > 0 and finite
 +     */
 +    public SWMRLong2ObjectHashTable(final int capacity, final float loadFactor) {
 +        final int tableSize = getCapacityFor(capacity);
@@ -5418,7 +5418,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * with the specified load factor.
 +     * All of the specified map's entries are copied into this map.
 +     * @param capacity specified capacity, > 0
-+     * @param loadFactor specified load factor, > 0 && finite
++     * @param loadFactor specified load factor, > 0 and finite
 +     * @param other The specified map.
 +     */
 +    public SWMRLong2ObjectHashTable(final int capacity, final float loadFactor, final SWMRLong2ObjectHashTable<V> other) {

patches/server/Improved-Watchdog-Support.patch

@@ -122,13 +122,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          if (this.metricsRecorder.isRecording()) {
              this.cancelRecordingMetrics();
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             this.getProfileCache().save(false); // Paper - Perf: Async GameProfileCache saving
          }
          // Spigot end
+ 
 +        // Paper start - move final shutdown items here
 +        LOGGER.info("Flushing Chunk IO");
 +        // Paper end - move final shutdown items here
-         io.papermc.paper.chunk.system.io.RegionFileIOThread.close(true); // Paper // Paper - rewrite chunk system
+         io.papermc.paper.chunk.system.io.RegionFileIOThread.close(true); // Paper - rewrite chunk system
 +        // Paper start - move final shutdown items here
 +        LOGGER.info("Closing Thread Pool");
 +        Util.shutdownExecutors(); // Paper

patches/server/MC-Utils.patch

@@ -2098,7 +2098,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import java.util.Collection;
 +
 +/**
-+ * @author Spottedleaf <Spottedleaf@users.noreply.github.com>
++ * @author Spottedleaf &lt;Spottedleaf@users.noreply.github.com>
 + */
 +public final class OptimizedSmallEnumSet<E extends Enum<E>> {
 +
@@ -3800,7 +3800,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * Ensures the target code is running on the main thread
 +     * @param reason
 +     * @param run
-+     * @return
 +     */
 +    public static void ensureMain(String reason, Runnable run) {
 +        if (!isMainThread()) {