diff --git a/build-data/dev-imports.txt b/build-data/dev-imports.txt
index 286aeeaaa9..b8740198d8 100644
--- a/build-data/dev-imports.txt
+++ b/build-data/dev-imports.txt
@@ -9,3 +9,4 @@
 #     minecraft net.minecraft.world.level.entity.LevelEntityGetterAdapter
 #     minecraft net/minecraft/world/level/entity/LevelEntityGetter.java
 
+minecraft net.minecraft.network.protocol.game.ClientboundLoginPacket
diff --git a/build-data/paper.at b/build-data/paper.at
index 5f1aa5b282..1417e2a6ce 100644
--- a/build-data/paper.at
+++ b/build-data/paper.at
@@ -9,6 +9,10 @@
 # Remap/Decompile fix (unclear why this is happening)
 public net.minecraft.server.MinecraftServer doRunTask(Lnet/minecraft/server/TickTask;)V
 
+# AT remap issue? todo 1.18
+public net.minecraft.world.level.dimension.end.EndDragonFight findExitPortal()Lnet/minecraft/world/level/block/state/pattern/BlockPattern$BlockPatternMatch;
+public net.minecraft.nbt.TagParser readArrayTag()Lnet/minecraft/nbt/Tag;
+
 # Paper config files
 public org.spigotmc.SpigotWorldConfig getBoolean(Ljava/lang/String;Z)Z
 public org.spigotmc.SpigotWorldConfig getDouble(Ljava/lang/String;)D
diff --git a/build.gradle.kts b/build.gradle.kts
index e9a60b8526..95b8082e4a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -48,7 +48,7 @@ repositories {
 dependencies {
     paramMappings("net.fabricmc:yarn:1.18-pre5+build.4:mergedv2")
     remapper("net.fabricmc:tiny-remapper:0.7.0:fat")
-    decompiler("org.quiltmc:quiltflower:1.6.0")
+    decompiler("net.minecraftforge:forgeflower:1.5.498.22")
     paperclip("io.papermc:paperclip:2.0.1")
 }
 
@@ -58,7 +58,7 @@ paperweight {
 
     paramMappingsRepo.set("https://maven.fabricmc.net/")
     remapRepo.set("https://maven.fabricmc.net/")
-    decompileRepo.set("https://maven.quiltmc.org/repository/release/")
+    decompileRepo.set("https://files.minecraftforge.net/maven/")
 
     paper {
         spigotApiPatchDir.set(layout.projectDirectory.dir("patches/api"))
diff --git a/patches/api/Add-FastUtil-to-Bukkit.patch b/patches/api/Add-FastUtil-to-Bukkit.patch
index 53950d2083..2dbdef4f39 100644
--- a/patches/api/Add-FastUtil-to-Bukkit.patch
+++ b/patches/api/Add-FastUtil-to-Bukkit.patch
@@ -13,7 +13,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      api("net.md-5:bungeecord-chat:1.16-R0.4")
      api("org.yaml:snakeyaml:1.28")
      api("com.googlecode.json-simple:json-simple:1.1.1") // Paper
-+    api("it.unimi.dsi:fastutil:8.2.2")
++    api("it.unimi.dsi:fastutil:8.5.6")
  
      compileOnly("org.apache.maven:maven-resolver-provider:3.8.1")
      compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
diff --git a/patches/server/Build-system-changes.patch b/patches/server/Build-system-changes.patch
index df9ea7d488..2bf0bc41b7 100644
--- a/patches/server/Build-system-changes.patch
+++ b/patches/server/Build-system-changes.patch
@@ -16,26 +16,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -        exclude(group = "org.apache.logging.log4j", module = "log4j-api")
 -    }
 +    implementation("org.apache.logging.log4j:log4j-iostreams:2.14.1") // Paper
-+    implementation("org.apache.logging.log4j:log4j-api:2.14.1") // Paper
      implementation("org.ow2.asm:asm:9.2")
 +    implementation("org.ow2.asm:asm-commons:9.2") // Paper - ASM event executor generation
      implementation("com.googlecode.json-simple:json-simple:1.1.1") {
          // This includes junit transitively for whatever reason
          isTransitive = false
-     }
-     runtimeOnly("org.xerial:sqlite-jdbc:3.34.0")
--    runtimeOnly("mysql:mysql-connector-java:5.1.49")
-+    runtimeOnly("mysql:mysql-connector-java:8.0.23") // Paper
- 
-     runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.1")
-     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
-     runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0")
- 
-+    implementation("io.netty:netty-all:4.1.65.Final") // Paper
-+
-     testImplementation("junit:junit:4.13.1")
-     testImplementation("org.hamcrest:hamcrest-library:1.3")
- }
 @@ -0,0 +0,0 @@ tasks.jar {
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
@@ -44,15 +29,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          )
          for (tld in setOf("net", "com", "org")) {
              attributes("$tld/bukkit", "Sealed" to true)
-@@ -0,0 +0,0 @@ relocation {
-     sequenceOf(
-         "commons-codec:commons-codec" to "org.apache.commons.codec",
-         "commons-io:commons-io" to "org.apache.commons.io",
--        "it.unimi.dsi:fastutil" to "it.unimi",
-+        //"it.unimi.dsi:fastutil" to "it.unimi", // Paper - don't relocate fastutil
-         "org.apache.commons:commons-lang3" to "org.apache.commons.lang3",
-         "org.ow2.asm:asm" to "org.objectweb.asm"
-     ).forEach { (owner, pack) ->
 @@ -0,0 +0,0 @@ relocation {
      }
  }
@@ -83,7 +59,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                    Date buildDate = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z").parse(Main.class.getPackage().getImplementationVendor()); // Paper
  
                      Calendar deadline = Calendar.getInstance();
-                     deadline.add(Calendar.DAY_OF_YEAR, -28);
+                     deadline.add(Calendar.DAY_OF_YEAR, -7);
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
diff --git a/patches/server/MC-Dev-fixes.patch b/patches/server/MC-Dev-fixes.patch
index 727aa5408a..3a8d1d8fda 100644
--- a/patches/server/MC-Dev-fixes.patch
+++ b/patches/server/MC-Dev-fixes.patch
@@ -49,7 +49,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import com.google.common.collect.Lists;
 +import it.unimi.dsi.fastutil.bytes.ByteOpenHashSet;
 +import it.unimi.dsi.fastutil.bytes.ByteSet;
-+
  import java.io.DataInput;
  import java.io.DataOutput;
  import java.io.IOException;
@@ -61,44 +60,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              return "TAG_List";
          }
      };
-+    private static final ByteSet INLINE_ELEMENT_TYPES = new ByteOpenHashSet(Arrays.asList((byte) 1, (byte) 2, (byte) 3, (byte) 4, (byte) 5, (byte) 6)); // Paper - decompiler fix
++    private static final ByteSet INLINE_ELEMENT_TYPES = new ByteOpenHashSet(Arrays.asList((byte) 1, (byte) 2, (byte) 3, (byte) 4, (byte) 5, (byte) 6)); // Paper - decompiler fix // todo: what is this
      private final List<Tag> list;
      private byte type;
  
-diff --git a/src/main/java/net/minecraft/nbt/NbtIo.java b/src/main/java/net/minecraft/nbt/NbtIo.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/nbt/NbtIo.java
-+++ b/src/main/java/net/minecraft/nbt/NbtIo.java
-@@ -0,0 +0,0 @@ import javax.annotation.Nullable;
- import net.minecraft.CrashReport;
- import net.minecraft.CrashReportCategory;
- import net.minecraft.ReportedException;
-+import io.netty.buffer.ByteBufInputStream; // Paper
- 
- public class NbtIo {
- 
-@@ -0,0 +0,0 @@ public class NbtIo {
- 
-     public static CompoundTag read(DataInput input, NbtAccounter tracker) throws IOException {
-         // Spigot start
--        if ( input instanceof io.netty.buffer.ByteBufInputStream )
-+        if ( input instanceof ByteBufInputStream) // Paper
-         {
-             input = new DataInputStream(new org.spigotmc.LimitStream((InputStream) input, tracker));
-         }
-diff --git a/src/main/java/net/minecraft/nbt/Tag.java b/src/main/java/net/minecraft/nbt/Tag.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/nbt/Tag.java
-+++ b/src/main/java/net/minecraft/nbt/Tag.java
-@@ -0,0 +0,0 @@ public interface Tag {
- 
-     TagType<?> getType();
- 
--    Tag copy();
-+    public Tag copy(); // Paper - decompile fix
- 
-     default String getAsString() {
-         return (new StringTagVisitor()).visit(this);
 diff --git a/src/main/java/net/minecraft/network/ConnectionProtocol.java b/src/main/java/net/minecraft/network/ConnectionProtocol.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/network/ConnectionProtocol.java
@@ -140,22 +105,61 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import net.minecraft.network.protocol.status.ServerStatusPacketListener;
  import net.minecraft.network.protocol.status.ServerboundPingRequestPacket;
  import net.minecraft.network.protocol.status.ServerboundStatusRequestPacket;
+ import net.minecraft.util.VisibleForDebug;
  import org.apache.logging.log4j.LogManager;
  
  public enum ConnectionProtocol {
 -    HANDSHAKING(-1, protocol().addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ClientIntentionPacket.class, ClientIntentionPacket::new))),
--    PLAY(0, protocol().addFlow(PacketFlow.CLIENTBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ClientboundAddEntityPacket.class, ClientboundAddEntityPacket::new).addPacket(ClientboundAddExperienceOrbPacket.class, ClientboundAddExperienceOrbPacket::new).addPacket(ClientboundAddMobPacket.class, ClientboundAddMobPacket::new).addPacket(ClientboundAddPaintingPacket.class, ClientboundAddPaintingPacket::new).addPacket(ClientboundAddPlayerPacket.class, ClientboundAddPlayerPacket::new).addPacket(ClientboundAddVibrationSignalPacket.class, ClientboundAddVibrationSignalPacket::new).addPacket(ClientboundAnimatePacket.class, ClientboundAnimatePacket::new).addPacket(ClientboundAwardStatsPacket.class, ClientboundAwardStatsPacket::new).addPacket(ClientboundBlockBreakAckPacket.class, ClientboundBlockBreakAckPacket::new).addPacket(ClientboundBlockDestructionPacket.class, ClientboundBlockDestructionPacket::new).addPacket(ClientboundBlockEntityDataPacket.class, ClientboundBlockEntityDataPacket::new).addPacket(ClientboundBlockEventPacket.class, ClientboundBlockEventPacket::new).addPacket(ClientboundBlockUpdatePacket.class, ClientboundBlockUpdatePacket::new).addPacket(ClientboundBossEventPacket.class, ClientboundBossEventPacket::new).addPacket(ClientboundChangeDifficultyPacket.class, ClientboundChangeDifficultyPacket::new).addPacket(ClientboundChatPacket.class, ClientboundChatPacket::new).addPacket(ClientboundClearTitlesPacket.class, ClientboundClearTitlesPacket::new).addPacket(ClientboundCommandSuggestionsPacket.class, ClientboundCommandSuggestionsPacket::new).addPacket(ClientboundCommandsPacket.class, ClientboundCommandsPacket::new).addPacket(ClientboundContainerClosePacket.class, ClientboundContainerClosePacket::new).addPacket(ClientboundContainerSetContentPacket.class, ClientboundContainerSetContentPacket::new).addPacket(ClientboundContainerSetDataPacket.class, ClientboundContainerSetDataPacket::new).addPacket(ClientboundContainerSetSlotPacket.class, ClientboundContainerSetSlotPacket::new).addPacket(ClientboundCooldownPacket.class, ClientboundCooldownPacket::new).addPacket(ClientboundCustomPayloadPacket.class, ClientboundCustomPayloadPacket::new).addPacket(ClientboundCustomSoundPacket.class, ClientboundCustomSoundPacket::new).addPacket(ClientboundDisconnectPacket.class, ClientboundDisconnectPacket::new).addPacket(ClientboundEntityEventPacket.class, ClientboundEntityEventPacket::new).addPacket(ClientboundExplodePacket.class, ClientboundExplodePacket::new).addPacket(ClientboundForgetLevelChunkPacket.class, ClientboundForgetLevelChunkPacket::new).addPacket(ClientboundGameEventPacket.class, ClientboundGameEventPacket::new).addPacket(ClientboundHorseScreenOpenPacket.class, ClientboundHorseScreenOpenPacket::new).addPacket(ClientboundInitializeBorderPacket.class, ClientboundInitializeBorderPacket::new).addPacket(ClientboundKeepAlivePacket.class, ClientboundKeepAlivePacket::new).addPacket(ClientboundLevelChunkPacket.class, ClientboundLevelChunkPacket::new).addPacket(ClientboundLevelEventPacket.class, ClientboundLevelEventPacket::new).addPacket(ClientboundLevelParticlesPacket.class, ClientboundLevelParticlesPacket::new).addPacket(ClientboundLightUpdatePacket.class, ClientboundLightUpdatePacket::new).addPacket(ClientboundLoginPacket.class, ClientboundLoginPacket::new).addPacket(ClientboundMapItemDataPacket.class, ClientboundMapItemDataPacket::new).addPacket(ClientboundMerchantOffersPacket.class, ClientboundMerchantOffersPacket::new).addPacket(ClientboundMoveEntityPacket.Pos.class, ClientboundMoveEntityPacket.Pos::read).addPacket(ClientboundMoveEntityPacket.PosRot.class, ClientboundMoveEntityPacket.PosRot::read).addPacket(ClientboundMoveEntityPacket.Rot.class, ClientboundMoveEntityPacket.Rot::read).addPacket(ClientboundMoveVehiclePacket.class, ClientboundMoveVehiclePacket::new).addPacket(ClientboundOpenBookPacket.class, ClientboundOpenBookPacket::new).addPacket(ClientboundOpenScreenPacket.class, ClientboundOpenScreenPacket::new).addPacket(ClientboundOpenSignEditorPacket.class, ClientboundOpenSignEditorPacket::new).addPacket(ClientboundPingPacket.class, ClientboundPingPacket::new).addPacket(ClientboundPlaceGhostRecipePacket.class, ClientboundPlaceGhostRecipePacket::new).addPacket(ClientboundPlayerAbilitiesPacket.class, ClientboundPlayerAbilitiesPacket::new).addPacket(ClientboundPlayerCombatEndPacket.class, ClientboundPlayerCombatEndPacket::new).addPacket(ClientboundPlayerCombatEnterPacket.class, ClientboundPlayerCombatEnterPacket::new).addPacket(ClientboundPlayerCombatKillPacket.class, ClientboundPlayerCombatKillPacket::new).addPacket(ClientboundPlayerInfoPacket.class, ClientboundPlayerInfoPacket::new).addPacket(ClientboundPlayerLookAtPacket.class, ClientboundPlayerLookAtPacket::new).addPacket(ClientboundPlayerPositionPacket.class, ClientboundPlayerPositionPacket::new).addPacket(ClientboundRecipePacket.class, ClientboundRecipePacket::new).addPacket(ClientboundRemoveEntitiesPacket.class, ClientboundRemoveEntitiesPacket::new).addPacket(ClientboundRemoveMobEffectPacket.class, ClientboundRemoveMobEffectPacket::new).addPacket(ClientboundResourcePackPacket.class, ClientboundResourcePackPacket::new).addPacket(ClientboundRespawnPacket.class, ClientboundRespawnPacket::new).addPacket(ClientboundRotateHeadPacket.class, ClientboundRotateHeadPacket::new).addPacket(ClientboundSectionBlocksUpdatePacket.class, ClientboundSectionBlocksUpdatePacket::new).addPacket(ClientboundSelectAdvancementsTabPacket.class, ClientboundSelectAdvancementsTabPacket::new).addPacket(ClientboundSetActionBarTextPacket.class, ClientboundSetActionBarTextPacket::new).addPacket(ClientboundSetBorderCenterPacket.class, ClientboundSetBorderCenterPacket::new).addPacket(ClientboundSetBorderLerpSizePacket.class, ClientboundSetBorderLerpSizePacket::new).addPacket(ClientboundSetBorderSizePacket.class, ClientboundSetBorderSizePacket::new).addPacket(ClientboundSetBorderWarningDelayPacket.class, ClientboundSetBorderWarningDelayPacket::new).addPacket(ClientboundSetBorderWarningDistancePacket.class, ClientboundSetBorderWarningDistancePacket::new).addPacket(ClientboundSetCameraPacket.class, ClientboundSetCameraPacket::new).addPacket(ClientboundSetCarriedItemPacket.class, ClientboundSetCarriedItemPacket::new).addPacket(ClientboundSetChunkCacheCenterPacket.class, ClientboundSetChunkCacheCenterPacket::new).addPacket(ClientboundSetChunkCacheRadiusPacket.class, ClientboundSetChunkCacheRadiusPacket::new).addPacket(ClientboundSetDefaultSpawnPositionPacket.class, ClientboundSetDefaultSpawnPositionPacket::new).addPacket(ClientboundSetDisplayObjectivePacket.class, ClientboundSetDisplayObjectivePacket::new).addPacket(ClientboundSetEntityDataPacket.class, ClientboundSetEntityDataPacket::new).addPacket(ClientboundSetEntityLinkPacket.class, ClientboundSetEntityLinkPacket::new).addPacket(ClientboundSetEntityMotionPacket.class, ClientboundSetEntityMotionPacket::new).addPacket(ClientboundSetEquipmentPacket.class, ClientboundSetEquipmentPacket::new).addPacket(ClientboundSetExperiencePacket.class, ClientboundSetExperiencePacket::new).addPacket(ClientboundSetHealthPacket.class, ClientboundSetHealthPacket::new).addPacket(ClientboundSetObjectivePacket.class, ClientboundSetObjectivePacket::new).addPacket(ClientboundSetPassengersPacket.class, ClientboundSetPassengersPacket::new).addPacket(ClientboundSetPlayerTeamPacket.class, ClientboundSetPlayerTeamPacket::new).addPacket(ClientboundSetScorePacket.class, ClientboundSetScorePacket::new).addPacket(ClientboundSetSubtitleTextPacket.class, ClientboundSetSubtitleTextPacket::new).addPacket(ClientboundSetTimePacket.class, ClientboundSetTimePacket::new).addPacket(ClientboundSetTitleTextPacket.class, ClientboundSetTitleTextPacket::new).addPacket(ClientboundSetTitlesAnimationPacket.class, ClientboundSetTitlesAnimationPacket::new).addPacket(ClientboundSoundEntityPacket.class, ClientboundSoundEntityPacket::new).addPacket(ClientboundSoundPacket.class, ClientboundSoundPacket::new).addPacket(ClientboundStopSoundPacket.class, ClientboundStopSoundPacket::new).addPacket(ClientboundTabListPacket.class, ClientboundTabListPacket::new).addPacket(ClientboundTagQueryPacket.class, ClientboundTagQueryPacket::new).addPacket(ClientboundTakeItemEntityPacket.class, ClientboundTakeItemEntityPacket::new).addPacket(ClientboundTeleportEntityPacket.class, ClientboundTeleportEntityPacket::new).addPacket(ClientboundUpdateAdvancementsPacket.class, ClientboundUpdateAdvancementsPacket::new).addPacket(ClientboundUpdateAttributesPacket.class, ClientboundUpdateAttributesPacket::new).addPacket(ClientboundUpdateMobEffectPacket.class, ClientboundUpdateMobEffectPacket::new).addPacket(ClientboundUpdateRecipesPacket.class, ClientboundUpdateRecipesPacket::new).addPacket(ClientboundUpdateTagsPacket.class, ClientboundUpdateTagsPacket::new)).addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ServerboundAcceptTeleportationPacket.class, ServerboundAcceptTeleportationPacket::new).addPacket(ServerboundBlockEntityTagQuery.class, ServerboundBlockEntityTagQuery::new).addPacket(ServerboundChangeDifficultyPacket.class, ServerboundChangeDifficultyPacket::new).addPacket(ServerboundChatPacket.class, ServerboundChatPacket::new).addPacket(ServerboundClientCommandPacket.class, ServerboundClientCommandPacket::new).addPacket(ServerboundClientInformationPacket.class, ServerboundClientInformationPacket::new).addPacket(ServerboundCommandSuggestionPacket.class, ServerboundCommandSuggestionPacket::new).addPacket(ServerboundContainerButtonClickPacket.class, ServerboundContainerButtonClickPacket::new).addPacket(ServerboundContainerClickPacket.class, ServerboundContainerClickPacket::new).addPacket(ServerboundContainerClosePacket.class, ServerboundContainerClosePacket::new).addPacket(ServerboundCustomPayloadPacket.class, ServerboundCustomPayloadPacket::new).addPacket(ServerboundEditBookPacket.class, ServerboundEditBookPacket::new).addPacket(ServerboundEntityTagQuery.class, ServerboundEntityTagQuery::new).addPacket(ServerboundInteractPacket.class, ServerboundInteractPacket::new).addPacket(ServerboundJigsawGeneratePacket.class, ServerboundJigsawGeneratePacket::new).addPacket(ServerboundKeepAlivePacket.class, ServerboundKeepAlivePacket::new).addPacket(ServerboundLockDifficultyPacket.class, ServerboundLockDifficultyPacket::new).addPacket(ServerboundMovePlayerPacket.Pos.class, ServerboundMovePlayerPacket.Pos::read).addPacket(ServerboundMovePlayerPacket.PosRot.class, ServerboundMovePlayerPacket.PosRot::read).addPacket(ServerboundMovePlayerPacket.Rot.class, ServerboundMovePlayerPacket.Rot::read).addPacket(ServerboundMovePlayerPacket.StatusOnly.class, ServerboundMovePlayerPacket.StatusOnly::read).addPacket(ServerboundMoveVehiclePacket.class, ServerboundMoveVehiclePacket::new).addPacket(ServerboundPaddleBoatPacket.class, ServerboundPaddleBoatPacket::new).addPacket(ServerboundPickItemPacket.class, ServerboundPickItemPacket::new).addPacket(ServerboundPlaceRecipePacket.class, ServerboundPlaceRecipePacket::new).addPacket(ServerboundPlayerAbilitiesPacket.class, ServerboundPlayerAbilitiesPacket::new).addPacket(ServerboundPlayerActionPacket.class, ServerboundPlayerActionPacket::new).addPacket(ServerboundPlayerCommandPacket.class, ServerboundPlayerCommandPacket::new).addPacket(ServerboundPlayerInputPacket.class, ServerboundPlayerInputPacket::new).addPacket(ServerboundPongPacket.class, ServerboundPongPacket::new).addPacket(ServerboundRecipeBookChangeSettingsPacket.class, ServerboundRecipeBookChangeSettingsPacket::new).addPacket(ServerboundRecipeBookSeenRecipePacket.class, ServerboundRecipeBookSeenRecipePacket::new).addPacket(ServerboundRenameItemPacket.class, ServerboundRenameItemPacket::new).addPacket(ServerboundResourcePackPacket.class, ServerboundResourcePackPacket::new).addPacket(ServerboundSeenAdvancementsPacket.class, ServerboundSeenAdvancementsPacket::new).addPacket(ServerboundSelectTradePacket.class, ServerboundSelectTradePacket::new).addPacket(ServerboundSetBeaconPacket.class, ServerboundSetBeaconPacket::new).addPacket(ServerboundSetCarriedItemPacket.class, ServerboundSetCarriedItemPacket::new).addPacket(ServerboundSetCommandBlockPacket.class, ServerboundSetCommandBlockPacket::new).addPacket(ServerboundSetCommandMinecartPacket.class, ServerboundSetCommandMinecartPacket::new).addPacket(ServerboundSetCreativeModeSlotPacket.class, ServerboundSetCreativeModeSlotPacket::new).addPacket(ServerboundSetJigsawBlockPacket.class, ServerboundSetJigsawBlockPacket::new).addPacket(ServerboundSetStructureBlockPacket.class, ServerboundSetStructureBlockPacket::new).addPacket(ServerboundSignUpdatePacket.class, ServerboundSignUpdatePacket::new).addPacket(ServerboundSwingPacket.class, ServerboundSwingPacket::new).addPacket(ServerboundTeleportToEntityPacket.class, ServerboundTeleportToEntityPacket::new).addPacket(ServerboundUseItemOnPacket.class, ServerboundUseItemOnPacket::new).addPacket(ServerboundUseItemPacket.class, ServerboundUseItemPacket::new))),
+-    PLAY(0, protocol().addFlow(PacketFlow.CLIENTBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ClientboundAddEntityPacket.class, ClientboundAddEntityPacket::new).addPacket(ClientboundAddExperienceOrbPacket.class, ClientboundAddExperienceOrbPacket::new).addPacket(ClientboundAddMobPacket.class, ClientboundAddMobPacket::new).addPacket(ClientboundAddPaintingPacket.class, ClientboundAddPaintingPacket::new).addPacket(ClientboundAddPlayerPacket.class, ClientboundAddPlayerPacket::new).addPacket(ClientboundAddVibrationSignalPacket.class, ClientboundAddVibrationSignalPacket::new).addPacket(ClientboundAnimatePacket.class, ClientboundAnimatePacket::new).addPacket(ClientboundAwardStatsPacket.class, ClientboundAwardStatsPacket::new).addPacket(ClientboundBlockBreakAckPacket.class, ClientboundBlockBreakAckPacket::new).addPacket(ClientboundBlockDestructionPacket.class, ClientboundBlockDestructionPacket::new).addPacket(ClientboundBlockEntityDataPacket.class, ClientboundBlockEntityDataPacket::new).addPacket(ClientboundBlockEventPacket.class, ClientboundBlockEventPacket::new).addPacket(ClientboundBlockUpdatePacket.class, ClientboundBlockUpdatePacket::new).addPacket(ClientboundBossEventPacket.class, ClientboundBossEventPacket::new).addPacket(ClientboundChangeDifficultyPacket.class, ClientboundChangeDifficultyPacket::new).addPacket(ClientboundChatPacket.class, ClientboundChatPacket::new).addPacket(ClientboundClearTitlesPacket.class, ClientboundClearTitlesPacket::new).addPacket(ClientboundCommandSuggestionsPacket.class, ClientboundCommandSuggestionsPacket::new).addPacket(ClientboundCommandsPacket.class, ClientboundCommandsPacket::new).addPacket(ClientboundContainerClosePacket.class, ClientboundContainerClosePacket::new).addPacket(ClientboundContainerSetContentPacket.class, ClientboundContainerSetContentPacket::new).addPacket(ClientboundContainerSetDataPacket.class, ClientboundContainerSetDataPacket::new).addPacket(ClientboundContainerSetSlotPacket.class, ClientboundContainerSetSlotPacket::new).addPacket(ClientboundCooldownPacket.class, ClientboundCooldownPacket::new).addPacket(ClientboundCustomPayloadPacket.class, ClientboundCustomPayloadPacket::new).addPacket(ClientboundCustomSoundPacket.class, ClientboundCustomSoundPacket::new).addPacket(ClientboundDisconnectPacket.class, ClientboundDisconnectPacket::new).addPacket(ClientboundEntityEventPacket.class, ClientboundEntityEventPacket::new).addPacket(ClientboundExplodePacket.class, ClientboundExplodePacket::new).addPacket(ClientboundForgetLevelChunkPacket.class, ClientboundForgetLevelChunkPacket::new).addPacket(ClientboundGameEventPacket.class, ClientboundGameEventPacket::new).addPacket(ClientboundHorseScreenOpenPacket.class, ClientboundHorseScreenOpenPacket::new).addPacket(ClientboundInitializeBorderPacket.class, ClientboundInitializeBorderPacket::new).addPacket(ClientboundKeepAlivePacket.class, ClientboundKeepAlivePacket::new).addPacket(ClientboundLevelChunkWithLightPacket.class, ClientboundLevelChunkWithLightPacket::new).addPacket(ClientboundLevelEventPacket.class, ClientboundLevelEventPacket::new).addPacket(ClientboundLevelParticlesPacket.class, ClientboundLevelParticlesPacket::new).addPacket(ClientboundLightUpdatePacket.class, ClientboundLightUpdatePacket::new).addPacket(ClientboundLoginPacket.class, ClientboundLoginPacket::new).addPacket(ClientboundMapItemDataPacket.class, ClientboundMapItemDataPacket::new).addPacket(ClientboundMerchantOffersPacket.class, ClientboundMerchantOffersPacket::new).addPacket(ClientboundMoveEntityPacket.Pos.class, ClientboundMoveEntityPacket.Pos::read).addPacket(ClientboundMoveEntityPacket.PosRot.class, ClientboundMoveEntityPacket.PosRot::read).addPacket(ClientboundMoveEntityPacket.Rot.class, ClientboundMoveEntityPacket.Rot::read).addPacket(ClientboundMoveVehiclePacket.class, ClientboundMoveVehiclePacket::new).addPacket(ClientboundOpenBookPacket.class, ClientboundOpenBookPacket::new).addPacket(ClientboundOpenScreenPacket.class, ClientboundOpenScreenPacket::new).addPacket(ClientboundOpenSignEditorPacket.class, ClientboundOpenSignEditorPacket::new).addPacket(ClientboundPingPacket.class, ClientboundPingPacket::new).addPacket(ClientboundPlaceGhostRecipePacket.class, ClientboundPlaceGhostRecipePacket::new).addPacket(ClientboundPlayerAbilitiesPacket.class, ClientboundPlayerAbilitiesPacket::new).addPacket(ClientboundPlayerCombatEndPacket.class, ClientboundPlayerCombatEndPacket::new).addPacket(ClientboundPlayerCombatEnterPacket.class, ClientboundPlayerCombatEnterPacket::new).addPacket(ClientboundPlayerCombatKillPacket.class, ClientboundPlayerCombatKillPacket::new).addPacket(ClientboundPlayerInfoPacket.class, ClientboundPlayerInfoPacket::new).addPacket(ClientboundPlayerLookAtPacket.class, ClientboundPlayerLookAtPacket::new).addPacket(ClientboundPlayerPositionPacket.class, ClientboundPlayerPositionPacket::new).addPacket(ClientboundRecipePacket.class, ClientboundRecipePacket::new).addPacket(ClientboundRemoveEntitiesPacket.class, ClientboundRemoveEntitiesPacket::new).addPacket(ClientboundRemoveMobEffectPacket.class, ClientboundRemoveMobEffectPacket::new).addPacket(ClientboundResourcePackPacket.class, ClientboundResourcePackPacket::new).addPacket(ClientboundRespawnPacket.class, ClientboundRespawnPacket::new).addPacket(ClientboundRotateHeadPacket.class, ClientboundRotateHeadPacket::new).addPacket(ClientboundSectionBlocksUpdatePacket.class, ClientboundSectionBlocksUpdatePacket::new).addPacket(ClientboundSelectAdvancementsTabPacket.class, ClientboundSelectAdvancementsTabPacket::new).addPacket(ClientboundSetActionBarTextPacket.class, ClientboundSetActionBarTextPacket::new).addPacket(ClientboundSetBorderCenterPacket.class, ClientboundSetBorderCenterPacket::new).addPacket(ClientboundSetBorderLerpSizePacket.class, ClientboundSetBorderLerpSizePacket::new).addPacket(ClientboundSetBorderSizePacket.class, ClientboundSetBorderSizePacket::new).addPacket(ClientboundSetBorderWarningDelayPacket.class, ClientboundSetBorderWarningDelayPacket::new).addPacket(ClientboundSetBorderWarningDistancePacket.class, ClientboundSetBorderWarningDistancePacket::new).addPacket(ClientboundSetCameraPacket.class, ClientboundSetCameraPacket::new).addPacket(ClientboundSetCarriedItemPacket.class, ClientboundSetCarriedItemPacket::new).addPacket(ClientboundSetChunkCacheCenterPacket.class, ClientboundSetChunkCacheCenterPacket::new).addPacket(ClientboundSetChunkCacheRadiusPacket.class, ClientboundSetChunkCacheRadiusPacket::new).addPacket(ClientboundSetDefaultSpawnPositionPacket.class, ClientboundSetDefaultSpawnPositionPacket::new).addPacket(ClientboundSetDisplayObjectivePacket.class, ClientboundSetDisplayObjectivePacket::new).addPacket(ClientboundSetEntityDataPacket.class, ClientboundSetEntityDataPacket::new).addPacket(ClientboundSetEntityLinkPacket.class, ClientboundSetEntityLinkPacket::new).addPacket(ClientboundSetEntityMotionPacket.class, ClientboundSetEntityMotionPacket::new).addPacket(ClientboundSetEquipmentPacket.class, ClientboundSetEquipmentPacket::new).addPacket(ClientboundSetExperiencePacket.class, ClientboundSetExperiencePacket::new).addPacket(ClientboundSetHealthPacket.class, ClientboundSetHealthPacket::new).addPacket(ClientboundSetObjectivePacket.class, ClientboundSetObjectivePacket::new).addPacket(ClientboundSetPassengersPacket.class, ClientboundSetPassengersPacket::new).addPacket(ClientboundSetPlayerTeamPacket.class, ClientboundSetPlayerTeamPacket::new).addPacket(ClientboundSetScorePacket.class, ClientboundSetScorePacket::new).addPacket(ClientboundSetSimulationDistancePacket.class, ClientboundSetSimulationDistancePacket::new).addPacket(ClientboundSetSubtitleTextPacket.class, ClientboundSetSubtitleTextPacket::new).addPacket(ClientboundSetTimePacket.class, ClientboundSetTimePacket::new).addPacket(ClientboundSetTitleTextPacket.class, ClientboundSetTitleTextPacket::new).addPacket(ClientboundSetTitlesAnimationPacket.class, ClientboundSetTitlesAnimationPacket::new).addPacket(ClientboundSoundEntityPacket.class, ClientboundSoundEntityPacket::new).addPacket(ClientboundSoundPacket.class, ClientboundSoundPacket::new).addPacket(ClientboundStopSoundPacket.class, ClientboundStopSoundPacket::new).addPacket(ClientboundTabListPacket.class, ClientboundTabListPacket::new).addPacket(ClientboundTagQueryPacket.class, ClientboundTagQueryPacket::new).addPacket(ClientboundTakeItemEntityPacket.class, ClientboundTakeItemEntityPacket::new).addPacket(ClientboundTeleportEntityPacket.class, ClientboundTeleportEntityPacket::new).addPacket(ClientboundUpdateAdvancementsPacket.class, ClientboundUpdateAdvancementsPacket::new).addPacket(ClientboundUpdateAttributesPacket.class, ClientboundUpdateAttributesPacket::new).addPacket(ClientboundUpdateMobEffectPacket.class, ClientboundUpdateMobEffectPacket::new).addPacket(ClientboundUpdateRecipesPacket.class, ClientboundUpdateRecipesPacket::new).addPacket(ClientboundUpdateTagsPacket.class, ClientboundUpdateTagsPacket::new)).addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ServerboundAcceptTeleportationPacket.class, ServerboundAcceptTeleportationPacket::new).addPacket(ServerboundBlockEntityTagQuery.class, ServerboundBlockEntityTagQuery::new).addPacket(ServerboundChangeDifficultyPacket.class, ServerboundChangeDifficultyPacket::new).addPacket(ServerboundChatPacket.class, ServerboundChatPacket::new).addPacket(ServerboundClientCommandPacket.class, ServerboundClientCommandPacket::new).addPacket(ServerboundClientInformationPacket.class, ServerboundClientInformationPacket::new).addPacket(ServerboundCommandSuggestionPacket.class, ServerboundCommandSuggestionPacket::new).addPacket(ServerboundContainerButtonClickPacket.class, ServerboundContainerButtonClickPacket::new).addPacket(ServerboundContainerClickPacket.class, ServerboundContainerClickPacket::new).addPacket(ServerboundContainerClosePacket.class, ServerboundContainerClosePacket::new).addPacket(ServerboundCustomPayloadPacket.class, ServerboundCustomPayloadPacket::new).addPacket(ServerboundEditBookPacket.class, ServerboundEditBookPacket::new).addPacket(ServerboundEntityTagQuery.class, ServerboundEntityTagQuery::new).addPacket(ServerboundInteractPacket.class, ServerboundInteractPacket::new).addPacket(ServerboundJigsawGeneratePacket.class, ServerboundJigsawGeneratePacket::new).addPacket(ServerboundKeepAlivePacket.class, ServerboundKeepAlivePacket::new).addPacket(ServerboundLockDifficultyPacket.class, ServerboundLockDifficultyPacket::new).addPacket(ServerboundMovePlayerPacket.Pos.class, ServerboundMovePlayerPacket.Pos::read).addPacket(ServerboundMovePlayerPacket.PosRot.class, ServerboundMovePlayerPacket.PosRot::read).addPacket(ServerboundMovePlayerPacket.Rot.class, ServerboundMovePlayerPacket.Rot::read).addPacket(ServerboundMovePlayerPacket.StatusOnly.class, ServerboundMovePlayerPacket.StatusOnly::read).addPacket(ServerboundMoveVehiclePacket.class, ServerboundMoveVehiclePacket::new).addPacket(ServerboundPaddleBoatPacket.class, ServerboundPaddleBoatPacket::new).addPacket(ServerboundPickItemPacket.class, ServerboundPickItemPacket::new).addPacket(ServerboundPlaceRecipePacket.class, ServerboundPlaceRecipePacket::new).addPacket(ServerboundPlayerAbilitiesPacket.class, ServerboundPlayerAbilitiesPacket::new).addPacket(ServerboundPlayerActionPacket.class, ServerboundPlayerActionPacket::new).addPacket(ServerboundPlayerCommandPacket.class, ServerboundPlayerCommandPacket::new).addPacket(ServerboundPlayerInputPacket.class, ServerboundPlayerInputPacket::new).addPacket(ServerboundPongPacket.class, ServerboundPongPacket::new).addPacket(ServerboundRecipeBookChangeSettingsPacket.class, ServerboundRecipeBookChangeSettingsPacket::new).addPacket(ServerboundRecipeBookSeenRecipePacket.class, ServerboundRecipeBookSeenRecipePacket::new).addPacket(ServerboundRenameItemPacket.class, ServerboundRenameItemPacket::new).addPacket(ServerboundResourcePackPacket.class, ServerboundResourcePackPacket::new).addPacket(ServerboundSeenAdvancementsPacket.class, ServerboundSeenAdvancementsPacket::new).addPacket(ServerboundSelectTradePacket.class, ServerboundSelectTradePacket::new).addPacket(ServerboundSetBeaconPacket.class, ServerboundSetBeaconPacket::new).addPacket(ServerboundSetCarriedItemPacket.class, ServerboundSetCarriedItemPacket::new).addPacket(ServerboundSetCommandBlockPacket.class, ServerboundSetCommandBlockPacket::new).addPacket(ServerboundSetCommandMinecartPacket.class, ServerboundSetCommandMinecartPacket::new).addPacket(ServerboundSetCreativeModeSlotPacket.class, ServerboundSetCreativeModeSlotPacket::new).addPacket(ServerboundSetJigsawBlockPacket.class, ServerboundSetJigsawBlockPacket::new).addPacket(ServerboundSetStructureBlockPacket.class, ServerboundSetStructureBlockPacket::new).addPacket(ServerboundSignUpdatePacket.class, ServerboundSignUpdatePacket::new).addPacket(ServerboundSwingPacket.class, ServerboundSwingPacket::new).addPacket(ServerboundTeleportToEntityPacket.class, ServerboundTeleportToEntityPacket::new).addPacket(ServerboundUseItemOnPacket.class, ServerboundUseItemOnPacket::new).addPacket(ServerboundUseItemPacket.class, ServerboundUseItemPacket::new))),
 -    STATUS(1, protocol().addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ServerboundStatusRequestPacket.class, ServerboundStatusRequestPacket::new).addPacket(ServerboundPingRequestPacket.class, ServerboundPingRequestPacket::new)).addFlow(PacketFlow.CLIENTBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ClientboundStatusResponsePacket.class, ClientboundStatusResponsePacket::new).addPacket(ClientboundPongResponsePacket.class, ClientboundPongResponsePacket::new))),
 -    LOGIN(2, protocol().addFlow(PacketFlow.CLIENTBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ClientboundLoginDisconnectPacket.class, ClientboundLoginDisconnectPacket::new).addPacket(ClientboundHelloPacket.class, ClientboundHelloPacket::new).addPacket(ClientboundGameProfilePacket.class, ClientboundGameProfilePacket::new).addPacket(ClientboundLoginCompressionPacket.class, ClientboundLoginCompressionPacket::new).addPacket(ClientboundCustomQueryPacket.class, ClientboundCustomQueryPacket::new)).addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ServerboundHelloPacket.class, ServerboundHelloPacket::new).addPacket(ServerboundKeyPacket.class, ServerboundKeyPacket::new).addPacket(ServerboundCustomQueryPacket.class, ServerboundCustomQueryPacket::new)));
 +    // Paper start - fix decompile error - add correct generic packet listeners (e.g. ServerHandshakePacketListener) to PacketSet's generic type, matching the packet flow direction
 +    HANDSHAKING(-1, protocol().addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet<ServerHandshakePacketListener>()).addPacket(ClientIntentionPacket.class, ClientIntentionPacket::new))),
-+    PLAY(0, protocol().addFlow(PacketFlow.CLIENTBOUND, (new ConnectionProtocol.PacketSet<ClientGamePacketListener>()).addPacket(ClientboundAddEntityPacket.class, ClientboundAddEntityPacket::new).addPacket(ClientboundAddExperienceOrbPacket.class, ClientboundAddExperienceOrbPacket::new).addPacket(ClientboundAddMobPacket.class, ClientboundAddMobPacket::new).addPacket(ClientboundAddPaintingPacket.class, ClientboundAddPaintingPacket::new).addPacket(ClientboundAddPlayerPacket.class, ClientboundAddPlayerPacket::new).addPacket(ClientboundAddVibrationSignalPacket.class, ClientboundAddVibrationSignalPacket::new).addPacket(ClientboundAnimatePacket.class, ClientboundAnimatePacket::new).addPacket(ClientboundAwardStatsPacket.class, ClientboundAwardStatsPacket::new).addPacket(ClientboundBlockBreakAckPacket.class, ClientboundBlockBreakAckPacket::new).addPacket(ClientboundBlockDestructionPacket.class, ClientboundBlockDestructionPacket::new).addPacket(ClientboundBlockEntityDataPacket.class, ClientboundBlockEntityDataPacket::new).addPacket(ClientboundBlockEventPacket.class, ClientboundBlockEventPacket::new).addPacket(ClientboundBlockUpdatePacket.class, ClientboundBlockUpdatePacket::new).addPacket(ClientboundBossEventPacket.class, ClientboundBossEventPacket::new).addPacket(ClientboundChangeDifficultyPacket.class, ClientboundChangeDifficultyPacket::new).addPacket(ClientboundChatPacket.class, ClientboundChatPacket::new).addPacket(ClientboundClearTitlesPacket.class, ClientboundClearTitlesPacket::new).addPacket(ClientboundCommandSuggestionsPacket.class, ClientboundCommandSuggestionsPacket::new).addPacket(ClientboundCommandsPacket.class, ClientboundCommandsPacket::new).addPacket(ClientboundContainerClosePacket.class, ClientboundContainerClosePacket::new).addPacket(ClientboundContainerSetContentPacket.class, ClientboundContainerSetContentPacket::new).addPacket(ClientboundContainerSetDataPacket.class, ClientboundContainerSetDataPacket::new).addPacket(ClientboundContainerSetSlotPacket.class, ClientboundContainerSetSlotPacket::new).addPacket(ClientboundCooldownPacket.class, ClientboundCooldownPacket::new).addPacket(ClientboundCustomPayloadPacket.class, ClientboundCustomPayloadPacket::new).addPacket(ClientboundCustomSoundPacket.class, ClientboundCustomSoundPacket::new).addPacket(ClientboundDisconnectPacket.class, ClientboundDisconnectPacket::new).addPacket(ClientboundEntityEventPacket.class, ClientboundEntityEventPacket::new).addPacket(ClientboundExplodePacket.class, ClientboundExplodePacket::new).addPacket(ClientboundForgetLevelChunkPacket.class, ClientboundForgetLevelChunkPacket::new).addPacket(ClientboundGameEventPacket.class, ClientboundGameEventPacket::new).addPacket(ClientboundHorseScreenOpenPacket.class, ClientboundHorseScreenOpenPacket::new).addPacket(ClientboundInitializeBorderPacket.class, ClientboundInitializeBorderPacket::new).addPacket(ClientboundKeepAlivePacket.class, ClientboundKeepAlivePacket::new).addPacket(ClientboundLevelChunkPacket.class, ClientboundLevelChunkPacket::new).addPacket(ClientboundLevelEventPacket.class, ClientboundLevelEventPacket::new).addPacket(ClientboundLevelParticlesPacket.class, ClientboundLevelParticlesPacket::new).addPacket(ClientboundLightUpdatePacket.class, ClientboundLightUpdatePacket::new).addPacket(ClientboundLoginPacket.class, ClientboundLoginPacket::new).addPacket(ClientboundMapItemDataPacket.class, ClientboundMapItemDataPacket::new).addPacket(ClientboundMerchantOffersPacket.class, ClientboundMerchantOffersPacket::new).addPacket(ClientboundMoveEntityPacket.Pos.class, ClientboundMoveEntityPacket.Pos::read).addPacket(ClientboundMoveEntityPacket.PosRot.class, ClientboundMoveEntityPacket.PosRot::read).addPacket(ClientboundMoveEntityPacket.Rot.class, ClientboundMoveEntityPacket.Rot::read).addPacket(ClientboundMoveVehiclePacket.class, ClientboundMoveVehiclePacket::new).addPacket(ClientboundOpenBookPacket.class, ClientboundOpenBookPacket::new).addPacket(ClientboundOpenScreenPacket.class, ClientboundOpenScreenPacket::new).addPacket(ClientboundOpenSignEditorPacket.class, ClientboundOpenSignEditorPacket::new).addPacket(ClientboundPingPacket.class, ClientboundPingPacket::new).addPacket(ClientboundPlaceGhostRecipePacket.class, ClientboundPlaceGhostRecipePacket::new).addPacket(ClientboundPlayerAbilitiesPacket.class, ClientboundPlayerAbilitiesPacket::new).addPacket(ClientboundPlayerCombatEndPacket.class, ClientboundPlayerCombatEndPacket::new).addPacket(ClientboundPlayerCombatEnterPacket.class, ClientboundPlayerCombatEnterPacket::new).addPacket(ClientboundPlayerCombatKillPacket.class, ClientboundPlayerCombatKillPacket::new).addPacket(ClientboundPlayerInfoPacket.class, ClientboundPlayerInfoPacket::new).addPacket(ClientboundPlayerLookAtPacket.class, ClientboundPlayerLookAtPacket::new).addPacket(ClientboundPlayerPositionPacket.class, ClientboundPlayerPositionPacket::new).addPacket(ClientboundRecipePacket.class, ClientboundRecipePacket::new).addPacket(ClientboundRemoveEntitiesPacket.class, ClientboundRemoveEntitiesPacket::new).addPacket(ClientboundRemoveMobEffectPacket.class, ClientboundRemoveMobEffectPacket::new).addPacket(ClientboundResourcePackPacket.class, ClientboundResourcePackPacket::new).addPacket(ClientboundRespawnPacket.class, ClientboundRespawnPacket::new).addPacket(ClientboundRotateHeadPacket.class, ClientboundRotateHeadPacket::new).addPacket(ClientboundSectionBlocksUpdatePacket.class, ClientboundSectionBlocksUpdatePacket::new).addPacket(ClientboundSelectAdvancementsTabPacket.class, ClientboundSelectAdvancementsTabPacket::new).addPacket(ClientboundSetActionBarTextPacket.class, ClientboundSetActionBarTextPacket::new).addPacket(ClientboundSetBorderCenterPacket.class, ClientboundSetBorderCenterPacket::new).addPacket(ClientboundSetBorderLerpSizePacket.class, ClientboundSetBorderLerpSizePacket::new).addPacket(ClientboundSetBorderSizePacket.class, ClientboundSetBorderSizePacket::new).addPacket(ClientboundSetBorderWarningDelayPacket.class, ClientboundSetBorderWarningDelayPacket::new).addPacket(ClientboundSetBorderWarningDistancePacket.class, ClientboundSetBorderWarningDistancePacket::new).addPacket(ClientboundSetCameraPacket.class, ClientboundSetCameraPacket::new).addPacket(ClientboundSetCarriedItemPacket.class, ClientboundSetCarriedItemPacket::new).addPacket(ClientboundSetChunkCacheCenterPacket.class, ClientboundSetChunkCacheCenterPacket::new).addPacket(ClientboundSetChunkCacheRadiusPacket.class, ClientboundSetChunkCacheRadiusPacket::new).addPacket(ClientboundSetDefaultSpawnPositionPacket.class, ClientboundSetDefaultSpawnPositionPacket::new).addPacket(ClientboundSetDisplayObjectivePacket.class, ClientboundSetDisplayObjectivePacket::new).addPacket(ClientboundSetEntityDataPacket.class, ClientboundSetEntityDataPacket::new).addPacket(ClientboundSetEntityLinkPacket.class, ClientboundSetEntityLinkPacket::new).addPacket(ClientboundSetEntityMotionPacket.class, ClientboundSetEntityMotionPacket::new).addPacket(ClientboundSetEquipmentPacket.class, ClientboundSetEquipmentPacket::new).addPacket(ClientboundSetExperiencePacket.class, ClientboundSetExperiencePacket::new).addPacket(ClientboundSetHealthPacket.class, ClientboundSetHealthPacket::new).addPacket(ClientboundSetObjectivePacket.class, ClientboundSetObjectivePacket::new).addPacket(ClientboundSetPassengersPacket.class, ClientboundSetPassengersPacket::new).addPacket(ClientboundSetPlayerTeamPacket.class, ClientboundSetPlayerTeamPacket::new).addPacket(ClientboundSetScorePacket.class, ClientboundSetScorePacket::new).addPacket(ClientboundSetSubtitleTextPacket.class, ClientboundSetSubtitleTextPacket::new).addPacket(ClientboundSetTimePacket.class, ClientboundSetTimePacket::new).addPacket(ClientboundSetTitleTextPacket.class, ClientboundSetTitleTextPacket::new).addPacket(ClientboundSetTitlesAnimationPacket.class, ClientboundSetTitlesAnimationPacket::new).addPacket(ClientboundSoundEntityPacket.class, ClientboundSoundEntityPacket::new).addPacket(ClientboundSoundPacket.class, ClientboundSoundPacket::new).addPacket(ClientboundStopSoundPacket.class, ClientboundStopSoundPacket::new).addPacket(ClientboundTabListPacket.class, ClientboundTabListPacket::new).addPacket(ClientboundTagQueryPacket.class, ClientboundTagQueryPacket::new).addPacket(ClientboundTakeItemEntityPacket.class, ClientboundTakeItemEntityPacket::new).addPacket(ClientboundTeleportEntityPacket.class, ClientboundTeleportEntityPacket::new).addPacket(ClientboundUpdateAdvancementsPacket.class, ClientboundUpdateAdvancementsPacket::new).addPacket(ClientboundUpdateAttributesPacket.class, ClientboundUpdateAttributesPacket::new).addPacket(ClientboundUpdateMobEffectPacket.class, ClientboundUpdateMobEffectPacket::new).addPacket(ClientboundUpdateRecipesPacket.class, ClientboundUpdateRecipesPacket::new).addPacket(ClientboundUpdateTagsPacket.class, ClientboundUpdateTagsPacket::new)).addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet<ServerGamePacketListener>()).addPacket(ServerboundAcceptTeleportationPacket.class, ServerboundAcceptTeleportationPacket::new).addPacket(ServerboundBlockEntityTagQuery.class, ServerboundBlockEntityTagQuery::new).addPacket(ServerboundChangeDifficultyPacket.class, ServerboundChangeDifficultyPacket::new).addPacket(ServerboundChatPacket.class, ServerboundChatPacket::new).addPacket(ServerboundClientCommandPacket.class, ServerboundClientCommandPacket::new).addPacket(ServerboundClientInformationPacket.class, ServerboundClientInformationPacket::new).addPacket(ServerboundCommandSuggestionPacket.class, ServerboundCommandSuggestionPacket::new).addPacket(ServerboundContainerButtonClickPacket.class, ServerboundContainerButtonClickPacket::new).addPacket(ServerboundContainerClickPacket.class, ServerboundContainerClickPacket::new).addPacket(ServerboundContainerClosePacket.class, ServerboundContainerClosePacket::new).addPacket(ServerboundCustomPayloadPacket.class, ServerboundCustomPayloadPacket::new).addPacket(ServerboundEditBookPacket.class, ServerboundEditBookPacket::new).addPacket(ServerboundEntityTagQuery.class, ServerboundEntityTagQuery::new).addPacket(ServerboundInteractPacket.class, ServerboundInteractPacket::new).addPacket(ServerboundJigsawGeneratePacket.class, ServerboundJigsawGeneratePacket::new).addPacket(ServerboundKeepAlivePacket.class, ServerboundKeepAlivePacket::new).addPacket(ServerboundLockDifficultyPacket.class, ServerboundLockDifficultyPacket::new).addPacket(ServerboundMovePlayerPacket.Pos.class, ServerboundMovePlayerPacket.Pos::read).addPacket(ServerboundMovePlayerPacket.PosRot.class, ServerboundMovePlayerPacket.PosRot::read).addPacket(ServerboundMovePlayerPacket.Rot.class, ServerboundMovePlayerPacket.Rot::read).addPacket(ServerboundMovePlayerPacket.StatusOnly.class, ServerboundMovePlayerPacket.StatusOnly::read).addPacket(ServerboundMoveVehiclePacket.class, ServerboundMoveVehiclePacket::new).addPacket(ServerboundPaddleBoatPacket.class, ServerboundPaddleBoatPacket::new).addPacket(ServerboundPickItemPacket.class, ServerboundPickItemPacket::new).addPacket(ServerboundPlaceRecipePacket.class, ServerboundPlaceRecipePacket::new).addPacket(ServerboundPlayerAbilitiesPacket.class, ServerboundPlayerAbilitiesPacket::new).addPacket(ServerboundPlayerActionPacket.class, ServerboundPlayerActionPacket::new).addPacket(ServerboundPlayerCommandPacket.class, ServerboundPlayerCommandPacket::new).addPacket(ServerboundPlayerInputPacket.class, ServerboundPlayerInputPacket::new).addPacket(ServerboundPongPacket.class, ServerboundPongPacket::new).addPacket(ServerboundRecipeBookChangeSettingsPacket.class, ServerboundRecipeBookChangeSettingsPacket::new).addPacket(ServerboundRecipeBookSeenRecipePacket.class, ServerboundRecipeBookSeenRecipePacket::new).addPacket(ServerboundRenameItemPacket.class, ServerboundRenameItemPacket::new).addPacket(ServerboundResourcePackPacket.class, ServerboundResourcePackPacket::new).addPacket(ServerboundSeenAdvancementsPacket.class, ServerboundSeenAdvancementsPacket::new).addPacket(ServerboundSelectTradePacket.class, ServerboundSelectTradePacket::new).addPacket(ServerboundSetBeaconPacket.class, ServerboundSetBeaconPacket::new).addPacket(ServerboundSetCarriedItemPacket.class, ServerboundSetCarriedItemPacket::new).addPacket(ServerboundSetCommandBlockPacket.class, ServerboundSetCommandBlockPacket::new).addPacket(ServerboundSetCommandMinecartPacket.class, ServerboundSetCommandMinecartPacket::new).addPacket(ServerboundSetCreativeModeSlotPacket.class, ServerboundSetCreativeModeSlotPacket::new).addPacket(ServerboundSetJigsawBlockPacket.class, ServerboundSetJigsawBlockPacket::new).addPacket(ServerboundSetStructureBlockPacket.class, ServerboundSetStructureBlockPacket::new).addPacket(ServerboundSignUpdatePacket.class, ServerboundSignUpdatePacket::new).addPacket(ServerboundSwingPacket.class, ServerboundSwingPacket::new).addPacket(ServerboundTeleportToEntityPacket.class, ServerboundTeleportToEntityPacket::new).addPacket(ServerboundUseItemOnPacket.class, ServerboundUseItemOnPacket::new).addPacket(ServerboundUseItemPacket.class, ServerboundUseItemPacket::new))),
++    PLAY(0, protocol().addFlow(PacketFlow.CLIENTBOUND, (new ConnectionProtocol.PacketSet<ClientGamePacketListener>()).addPacket(ClientboundAddEntityPacket.class, ClientboundAddEntityPacket::new).addPacket(ClientboundAddExperienceOrbPacket.class, ClientboundAddExperienceOrbPacket::new).addPacket(ClientboundAddMobPacket.class, ClientboundAddMobPacket::new).addPacket(ClientboundAddPaintingPacket.class, ClientboundAddPaintingPacket::new).addPacket(ClientboundAddPlayerPacket.class, ClientboundAddPlayerPacket::new).addPacket(ClientboundAddVibrationSignalPacket.class, ClientboundAddVibrationSignalPacket::new).addPacket(ClientboundAnimatePacket.class, ClientboundAnimatePacket::new).addPacket(ClientboundAwardStatsPacket.class, ClientboundAwardStatsPacket::new).addPacket(ClientboundBlockBreakAckPacket.class, ClientboundBlockBreakAckPacket::new).addPacket(ClientboundBlockDestructionPacket.class, ClientboundBlockDestructionPacket::new).addPacket(ClientboundBlockEntityDataPacket.class, ClientboundBlockEntityDataPacket::new).addPacket(ClientboundBlockEventPacket.class, ClientboundBlockEventPacket::new).addPacket(ClientboundBlockUpdatePacket.class, ClientboundBlockUpdatePacket::new).addPacket(ClientboundBossEventPacket.class, ClientboundBossEventPacket::new).addPacket(ClientboundChangeDifficultyPacket.class, ClientboundChangeDifficultyPacket::new).addPacket(ClientboundChatPacket.class, ClientboundChatPacket::new).addPacket(ClientboundClearTitlesPacket.class, ClientboundClearTitlesPacket::new).addPacket(ClientboundCommandSuggestionsPacket.class, ClientboundCommandSuggestionsPacket::new).addPacket(ClientboundCommandsPacket.class, ClientboundCommandsPacket::new).addPacket(ClientboundContainerClosePacket.class, ClientboundContainerClosePacket::new).addPacket(ClientboundContainerSetContentPacket.class, ClientboundContainerSetContentPacket::new).addPacket(ClientboundContainerSetDataPacket.class, ClientboundContainerSetDataPacket::new).addPacket(ClientboundContainerSetSlotPacket.class, ClientboundContainerSetSlotPacket::new).addPacket(ClientboundCooldownPacket.class, ClientboundCooldownPacket::new).addPacket(ClientboundCustomPayloadPacket.class, ClientboundCustomPayloadPacket::new).addPacket(ClientboundCustomSoundPacket.class, ClientboundCustomSoundPacket::new).addPacket(ClientboundDisconnectPacket.class, ClientboundDisconnectPacket::new).addPacket(ClientboundEntityEventPacket.class, ClientboundEntityEventPacket::new).addPacket(ClientboundExplodePacket.class, ClientboundExplodePacket::new).addPacket(ClientboundForgetLevelChunkPacket.class, ClientboundForgetLevelChunkPacket::new).addPacket(ClientboundGameEventPacket.class, ClientboundGameEventPacket::new).addPacket(ClientboundHorseScreenOpenPacket.class, ClientboundHorseScreenOpenPacket::new).addPacket(ClientboundInitializeBorderPacket.class, ClientboundInitializeBorderPacket::new).addPacket(ClientboundKeepAlivePacket.class, ClientboundKeepAlivePacket::new).addPacket(ClientboundLevelChunkWithLightPacket.class, ClientboundLevelChunkWithLightPacket::new).addPacket(ClientboundLevelEventPacket.class, ClientboundLevelEventPacket::new).addPacket(ClientboundLevelParticlesPacket.class, ClientboundLevelParticlesPacket::new).addPacket(ClientboundLightUpdatePacket.class, ClientboundLightUpdatePacket::new).addPacket(ClientboundLoginPacket.class, ClientboundLoginPacket::new).addPacket(ClientboundMapItemDataPacket.class, ClientboundMapItemDataPacket::new).addPacket(ClientboundMerchantOffersPacket.class, ClientboundMerchantOffersPacket::new).addPacket(ClientboundMoveEntityPacket.Pos.class, ClientboundMoveEntityPacket.Pos::read).addPacket(ClientboundMoveEntityPacket.PosRot.class, ClientboundMoveEntityPacket.PosRot::read).addPacket(ClientboundMoveEntityPacket.Rot.class, ClientboundMoveEntityPacket.Rot::read).addPacket(ClientboundMoveVehiclePacket.class, ClientboundMoveVehiclePacket::new).addPacket(ClientboundOpenBookPacket.class, ClientboundOpenBookPacket::new).addPacket(ClientboundOpenScreenPacket.class, ClientboundOpenScreenPacket::new).addPacket(ClientboundOpenSignEditorPacket.class, ClientboundOpenSignEditorPacket::new).addPacket(ClientboundPingPacket.class, ClientboundPingPacket::new).addPacket(ClientboundPlaceGhostRecipePacket.class, ClientboundPlaceGhostRecipePacket::new).addPacket(ClientboundPlayerAbilitiesPacket.class, ClientboundPlayerAbilitiesPacket::new).addPacket(ClientboundPlayerCombatEndPacket.class, ClientboundPlayerCombatEndPacket::new).addPacket(ClientboundPlayerCombatEnterPacket.class, ClientboundPlayerCombatEnterPacket::new).addPacket(ClientboundPlayerCombatKillPacket.class, ClientboundPlayerCombatKillPacket::new).addPacket(ClientboundPlayerInfoPacket.class, ClientboundPlayerInfoPacket::new).addPacket(ClientboundPlayerLookAtPacket.class, ClientboundPlayerLookAtPacket::new).addPacket(ClientboundPlayerPositionPacket.class, ClientboundPlayerPositionPacket::new).addPacket(ClientboundRecipePacket.class, ClientboundRecipePacket::new).addPacket(ClientboundRemoveEntitiesPacket.class, ClientboundRemoveEntitiesPacket::new).addPacket(ClientboundRemoveMobEffectPacket.class, ClientboundRemoveMobEffectPacket::new).addPacket(ClientboundResourcePackPacket.class, ClientboundResourcePackPacket::new).addPacket(ClientboundRespawnPacket.class, ClientboundRespawnPacket::new).addPacket(ClientboundRotateHeadPacket.class, ClientboundRotateHeadPacket::new).addPacket(ClientboundSectionBlocksUpdatePacket.class, ClientboundSectionBlocksUpdatePacket::new).addPacket(ClientboundSelectAdvancementsTabPacket.class, ClientboundSelectAdvancementsTabPacket::new).addPacket(ClientboundSetActionBarTextPacket.class, ClientboundSetActionBarTextPacket::new).addPacket(ClientboundSetBorderCenterPacket.class, ClientboundSetBorderCenterPacket::new).addPacket(ClientboundSetBorderLerpSizePacket.class, ClientboundSetBorderLerpSizePacket::new).addPacket(ClientboundSetBorderSizePacket.class, ClientboundSetBorderSizePacket::new).addPacket(ClientboundSetBorderWarningDelayPacket.class, ClientboundSetBorderWarningDelayPacket::new).addPacket(ClientboundSetBorderWarningDistancePacket.class, ClientboundSetBorderWarningDistancePacket::new).addPacket(ClientboundSetCameraPacket.class, ClientboundSetCameraPacket::new).addPacket(ClientboundSetCarriedItemPacket.class, ClientboundSetCarriedItemPacket::new).addPacket(ClientboundSetChunkCacheCenterPacket.class, ClientboundSetChunkCacheCenterPacket::new).addPacket(ClientboundSetChunkCacheRadiusPacket.class, ClientboundSetChunkCacheRadiusPacket::new).addPacket(ClientboundSetDefaultSpawnPositionPacket.class, ClientboundSetDefaultSpawnPositionPacket::new).addPacket(ClientboundSetDisplayObjectivePacket.class, ClientboundSetDisplayObjectivePacket::new).addPacket(ClientboundSetEntityDataPacket.class, ClientboundSetEntityDataPacket::new).addPacket(ClientboundSetEntityLinkPacket.class, ClientboundSetEntityLinkPacket::new).addPacket(ClientboundSetEntityMotionPacket.class, ClientboundSetEntityMotionPacket::new).addPacket(ClientboundSetEquipmentPacket.class, ClientboundSetEquipmentPacket::new).addPacket(ClientboundSetExperiencePacket.class, ClientboundSetExperiencePacket::new).addPacket(ClientboundSetHealthPacket.class, ClientboundSetHealthPacket::new).addPacket(ClientboundSetObjectivePacket.class, ClientboundSetObjectivePacket::new).addPacket(ClientboundSetPassengersPacket.class, ClientboundSetPassengersPacket::new).addPacket(ClientboundSetPlayerTeamPacket.class, ClientboundSetPlayerTeamPacket::new).addPacket(ClientboundSetScorePacket.class, ClientboundSetScorePacket::new).addPacket(ClientboundSetSimulationDistancePacket.class, ClientboundSetSimulationDistancePacket::new).addPacket(ClientboundSetSubtitleTextPacket.class, ClientboundSetSubtitleTextPacket::new).addPacket(ClientboundSetTimePacket.class, ClientboundSetTimePacket::new).addPacket(ClientboundSetTitleTextPacket.class, ClientboundSetTitleTextPacket::new).addPacket(ClientboundSetTitlesAnimationPacket.class, ClientboundSetTitlesAnimationPacket::new).addPacket(ClientboundSoundEntityPacket.class, ClientboundSoundEntityPacket::new).addPacket(ClientboundSoundPacket.class, ClientboundSoundPacket::new).addPacket(ClientboundStopSoundPacket.class, ClientboundStopSoundPacket::new).addPacket(ClientboundTabListPacket.class, ClientboundTabListPacket::new).addPacket(ClientboundTagQueryPacket.class, ClientboundTagQueryPacket::new).addPacket(ClientboundTakeItemEntityPacket.class, ClientboundTakeItemEntityPacket::new).addPacket(ClientboundTeleportEntityPacket.class, ClientboundTeleportEntityPacket::new).addPacket(ClientboundUpdateAdvancementsPacket.class, ClientboundUpdateAdvancementsPacket::new).addPacket(ClientboundUpdateAttributesPacket.class, ClientboundUpdateAttributesPacket::new).addPacket(ClientboundUpdateMobEffectPacket.class, ClientboundUpdateMobEffectPacket::new).addPacket(ClientboundUpdateRecipesPacket.class, ClientboundUpdateRecipesPacket::new).addPacket(ClientboundUpdateTagsPacket.class, ClientboundUpdateTagsPacket::new)).addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet<ServerGamePacketListener>()).addPacket(ServerboundAcceptTeleportationPacket.class, ServerboundAcceptTeleportationPacket::new).addPacket(ServerboundBlockEntityTagQuery.class, ServerboundBlockEntityTagQuery::new).addPacket(ServerboundChangeDifficultyPacket.class, ServerboundChangeDifficultyPacket::new).addPacket(ServerboundChatPacket.class, ServerboundChatPacket::new).addPacket(ServerboundClientCommandPacket.class, ServerboundClientCommandPacket::new).addPacket(ServerboundClientInformationPacket.class, ServerboundClientInformationPacket::new).addPacket(ServerboundCommandSuggestionPacket.class, ServerboundCommandSuggestionPacket::new).addPacket(ServerboundContainerButtonClickPacket.class, ServerboundContainerButtonClickPacket::new).addPacket(ServerboundContainerClickPacket.class, ServerboundContainerClickPacket::new).addPacket(ServerboundContainerClosePacket.class, ServerboundContainerClosePacket::new).addPacket(ServerboundCustomPayloadPacket.class, ServerboundCustomPayloadPacket::new).addPacket(ServerboundEditBookPacket.class, ServerboundEditBookPacket::new).addPacket(ServerboundEntityTagQuery.class, ServerboundEntityTagQuery::new).addPacket(ServerboundInteractPacket.class, ServerboundInteractPacket::new).addPacket(ServerboundJigsawGeneratePacket.class, ServerboundJigsawGeneratePacket::new).addPacket(ServerboundKeepAlivePacket.class, ServerboundKeepAlivePacket::new).addPacket(ServerboundLockDifficultyPacket.class, ServerboundLockDifficultyPacket::new).addPacket(ServerboundMovePlayerPacket.Pos.class, ServerboundMovePlayerPacket.Pos::read).addPacket(ServerboundMovePlayerPacket.PosRot.class, ServerboundMovePlayerPacket.PosRot::read).addPacket(ServerboundMovePlayerPacket.Rot.class, ServerboundMovePlayerPacket.Rot::read).addPacket(ServerboundMovePlayerPacket.StatusOnly.class, ServerboundMovePlayerPacket.StatusOnly::read).addPacket(ServerboundMoveVehiclePacket.class, ServerboundMoveVehiclePacket::new).addPacket(ServerboundPaddleBoatPacket.class, ServerboundPaddleBoatPacket::new).addPacket(ServerboundPickItemPacket.class, ServerboundPickItemPacket::new).addPacket(ServerboundPlaceRecipePacket.class, ServerboundPlaceRecipePacket::new).addPacket(ServerboundPlayerAbilitiesPacket.class, ServerboundPlayerAbilitiesPacket::new).addPacket(ServerboundPlayerActionPacket.class, ServerboundPlayerActionPacket::new).addPacket(ServerboundPlayerCommandPacket.class, ServerboundPlayerCommandPacket::new).addPacket(ServerboundPlayerInputPacket.class, ServerboundPlayerInputPacket::new).addPacket(ServerboundPongPacket.class, ServerboundPongPacket::new).addPacket(ServerboundRecipeBookChangeSettingsPacket.class, ServerboundRecipeBookChangeSettingsPacket::new).addPacket(ServerboundRecipeBookSeenRecipePacket.class, ServerboundRecipeBookSeenRecipePacket::new).addPacket(ServerboundRenameItemPacket.class, ServerboundRenameItemPacket::new).addPacket(ServerboundResourcePackPacket.class, ServerboundResourcePackPacket::new).addPacket(ServerboundSeenAdvancementsPacket.class, ServerboundSeenAdvancementsPacket::new).addPacket(ServerboundSelectTradePacket.class, ServerboundSelectTradePacket::new).addPacket(ServerboundSetBeaconPacket.class, ServerboundSetBeaconPacket::new).addPacket(ServerboundSetCarriedItemPacket.class, ServerboundSetCarriedItemPacket::new).addPacket(ServerboundSetCommandBlockPacket.class, ServerboundSetCommandBlockPacket::new).addPacket(ServerboundSetCommandMinecartPacket.class, ServerboundSetCommandMinecartPacket::new).addPacket(ServerboundSetCreativeModeSlotPacket.class, ServerboundSetCreativeModeSlotPacket::new).addPacket(ServerboundSetJigsawBlockPacket.class, ServerboundSetJigsawBlockPacket::new).addPacket(ServerboundSetStructureBlockPacket.class, ServerboundSetStructureBlockPacket::new).addPacket(ServerboundSignUpdatePacket.class, ServerboundSignUpdatePacket::new).addPacket(ServerboundSwingPacket.class, ServerboundSwingPacket::new).addPacket(ServerboundTeleportToEntityPacket.class, ServerboundTeleportToEntityPacket::new).addPacket(ServerboundUseItemOnPacket.class, ServerboundUseItemOnPacket::new).addPacket(ServerboundUseItemPacket.class, ServerboundUseItemPacket::new))),
 +    STATUS(1, protocol().addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet<ServerStatusPacketListener>()).addPacket(ServerboundStatusRequestPacket.class, ServerboundStatusRequestPacket::new).addPacket(ServerboundPingRequestPacket.class, ServerboundPingRequestPacket::new)).addFlow(PacketFlow.CLIENTBOUND, (new ConnectionProtocol.PacketSet<ClientStatusPacketListener>()).addPacket(ClientboundStatusResponsePacket.class, ClientboundStatusResponsePacket::new).addPacket(ClientboundPongResponsePacket.class, ClientboundPongResponsePacket::new))),
 +    LOGIN(2, protocol().addFlow(PacketFlow.CLIENTBOUND, (new ConnectionProtocol.PacketSet<ClientLoginPacketListener>()).addPacket(ClientboundLoginDisconnectPacket.class, ClientboundLoginDisconnectPacket::new).addPacket(ClientboundHelloPacket.class, ClientboundHelloPacket::new).addPacket(ClientboundGameProfilePacket.class, ClientboundGameProfilePacket::new).addPacket(ClientboundLoginCompressionPacket.class, ClientboundLoginCompressionPacket::new).addPacket(ClientboundCustomQueryPacket.class, ClientboundCustomQueryPacket::new)).addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet<ServerLoginPacketListener>()).addPacket(ServerboundHelloPacket.class, ServerboundHelloPacket::new).addPacket(ServerboundKeyPacket.class, ServerboundKeyPacket::new).addPacket(ServerboundCustomQueryPacket.class, ServerboundCustomQueryPacket::new)));
 +    // Paper end
  
      private static final int MIN_PROTOCOL_ID = -1;
      private static final int MAX_PROTOCOL_ID = 2;
+diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLoginPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLoginPacket.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLoginPacket.java
++++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLoginPacket.java
+@@ -0,0 +0,0 @@ import net.minecraft.world.level.GameType;
+ import net.minecraft.world.level.Level;
+ import net.minecraft.world.level.dimension.DimensionType;
+ 
+-public record ClientboundLoginPacket(int playerId, boolean hardcore, GameType gameType, GameType previousGameType, Set<ResourceKey<Level>> levels, RegistryAccess.RegistryHolder registryHolder, DimensionType dimensionType, ResourceKey<Level> dimension, long seed, int maxPlayers, int chunkRadius, int simulationDistance, boolean reducedDebugInfo, boolean showDeathScreen, boolean isDebug, boolean isFlat) implements Packet {
++public record ClientboundLoginPacket(int playerId, boolean hardcore, GameType gameType, GameType previousGameType, Set<ResourceKey<Level>> levels, RegistryAccess.RegistryHolder registryHolder, DimensionType dimensionType, ResourceKey<Level> dimension, long seed, int maxPlayers, int chunkRadius, int simulationDistance, boolean reducedDebugInfo, boolean showDeathScreen, boolean isDebug, boolean isFlat) implements Packet<ClientGamePacketListener> { // Paper - fix missing generic
+     public ClientboundLoginPacket(FriendlyByteBuf buf) {
+         this(buf.readInt(), buf.readBoolean(), GameType.byId(buf.readByte()), GameType.byNullableId(buf.readByte()), buf.readCollection(Sets::newHashSetWithExpectedSize, (b) -> {
+             return ResourceKey.create(Registry.DIMENSION_REGISTRY, b.readResourceLocation());
+         }), buf.readWithCodec(RegistryAccess.RegistryHolder.NETWORK_CODEC), buf.readWithCodec(DimensionType.CODEC).get(), ResourceKey.create(Registry.DIMENSION_REGISTRY, buf.readResourceLocation()), buf.readLong(), buf.readVarInt(), buf.readVarInt(), buf.readVarInt(), buf.readBoolean(), buf.readBoolean(), buf.readBoolean(), buf.readBoolean());
+     }
+ 
+-    public ClientboundLoginPacket(int playerEntityId, boolean bl, GameType previousGameMode, @Nullable GameType gameType, Set<ResourceKey<Level>> set, RegistryAccess.RegistryHolder registryHolder, DimensionType dimensionType, ResourceKey<Level> resourceKey, long l, int maxPlayers, int chunkLoadDistance, int i, boolean bl2, boolean bl3, boolean bl4, boolean bl5) {
+-        this.playerId = playerEntityId;
+-        this.hardcore = bl;
+-        this.gameType = previousGameMode;
+-        this.previousGameType = gameType;
+-        this.levels = set;
+-        this.registryHolder = registryHolder;
+-        this.dimensionType = dimensionType;
+-        this.dimension = resourceKey;
+-        this.seed = l;
+-        this.maxPlayers = maxPlayers;
+-        this.chunkRadius = chunkLoadDistance;
+-        this.simulationDistance = i;
+-        this.reducedDebugInfo = bl2;
+-        this.showDeathScreen = bl3;
+-        this.isDebug = bl4;
+-        this.isFlat = bl5;
+-    }
+-
+     @Override
+     public void write(FriendlyByteBuf buf) {
+         buf.writeInt(this.playerId);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -165,7 +169,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
              Objects.requireNonNull(this.packRepository);
 -            return stream.map(resourcepackrepository::getPack).filter(Objects::nonNull).map(Pack::open).collect(ImmutableList.toImmutableList()); // CraftBukkit - decompile error
-+            return stream.<Pack>map(resourcepackrepository::getPack).filter(Objects::nonNull).map(Pack::open).collect(ImmutableList.toImmutableList()); // CraftBukkit - decompile error // Paper - decompile error
++            return stream.<Pack>map(resourcepackrepository::getPack).filter(Objects::nonNull).map(Pack::open).collect(ImmutableList.toImmutableList()); // CraftBukkit - decompile error // Paper - decompile error // todo: is this needed anymore?
          }, this).thenCompose((immutablelist) -> {
              return ServerResources.loadResources(immutablelist, this.registryHolder, this.isDedicatedServer() ? Commands.CommandSelection.DEDICATED : Commands.CommandSelection.INTEGRATED, this.getFunctionCompilationLevel(), this.executor, this);
          }).thenAcceptAsync((datapackresources) -> {
@@ -182,19 +186,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          }
      }
  
-diff --git a/src/main/java/net/minecraft/stats/ServerStatsCounter.java b/src/main/java/net/minecraft/stats/ServerStatsCounter.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/stats/ServerStatsCounter.java
-+++ b/src/main/java/net/minecraft/stats/ServerStatsCounter.java
-@@ -0,0 +0,0 @@ public class ServerStatsCounter extends StatsCounter {
-         ObjectIterator objectiterator = this.stats.object2IntEntrySet().iterator();
- 
-         while (objectiterator.hasNext()) {
--            it.unimi.dsi.fastutil.objects.Object2IntMap.Entry<Stat<?>> it_unimi_dsi_fastutil_objects_object2intmap_entry = (it.unimi.dsi.fastutil.objects.Object2IntMap.Entry) objectiterator.next();
-+            Object2IntMap.Entry<Stat<?>> it_unimi_dsi_fastutil_objects_object2intmap_entry = (Object2IntMap.Entry) objectiterator.next(); // Paper - decompile fix
-             Stat<?> statistic = (Stat) it_unimi_dsi_fastutil_objects_object2intmap_entry.getKey();
- 
-             ((JsonObject) map.computeIfAbsent(statistic.getType(), (statisticwrapper) -> {
 diff --git a/src/main/java/net/minecraft/util/SortedArraySet.java b/src/main/java/net/minecraft/util/SortedArraySet.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/util/SortedArraySet.java
@@ -208,19 +199,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      public static <T> SortedArraySet<T> create(Comparator<T> comparator) {
-diff --git a/src/main/java/net/minecraft/util/thread/ProcessorMailbox.java b/src/main/java/net/minecraft/util/thread/ProcessorMailbox.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/util/thread/ProcessorMailbox.java
-+++ b/src/main/java/net/minecraft/util/thread/ProcessorMailbox.java
-@@ -0,0 +0,0 @@ public class ProcessorMailbox<T> implements ProfilerMeasured, ProcessorHandle<T>
-     @Override
-     public void run() {
-         try {
--            this.pollUntil((i) -> {
-+            this.pollUntil((int i) -> { // Paper - decompile fix
-                 return i == 0;
-             });
-         } finally {
 diff --git a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java b/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java
@@ -243,7 +221,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
          this.recipes = (Map) map1.entrySet().stream().collect(ImmutableMap.toImmutableMap(Entry::getKey, (entry1) -> {
 -            return (entry1.getValue()); // CraftBukkit
-+            return entry1.getValue(); // CraftBukkit // Paper - decompile fix - *shrugs internally*
++            return entry1.getValue(); // CraftBukkit // Paper - decompile fix - *shrugs internally* // todo: is this needed anymore?
          }));
          RecipeManager.LOGGER.info("Loaded {} recipes", map1.size());
      }
@@ -276,10 +254,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            return biome.climateSettings;
 +        }), Biome.BiomeCategory.CODEC.fieldOf("category").forGetter((biome) -> {
 +            return biome.biomeCategory;
-+        }), Codec.FLOAT.fieldOf("depth").forGetter((biome) -> {
-+            return biome.depth;
-+        }), Codec.FLOAT.fieldOf("scale").forGetter((biome) -> {
-+            return biome.scale;
 +        }), BiomeSpecialEffects.CODEC.fieldOf("effects").forGetter((biome) -> {
 +            return biome.specialEffects;
 +        }), BiomeGenerationSettings.CODEC.forGetter((biome) -> {
@@ -293,20 +267,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            return biome.climateSettings;
 +        }), Biome.BiomeCategory.CODEC.fieldOf("category").forGetter((biome) -> {
 +            return biome.biomeCategory;
-+        }), Codec.FLOAT.fieldOf("depth").forGetter((biome) -> {
-+            return biome.depth;
-+        }), Codec.FLOAT.fieldOf("scale").forGetter((biome) -> {
-+            return biome.scale;
 +        }), BiomeSpecialEffects.CODEC.fieldOf("effects").forGetter((biome) -> {
 +            return biome.specialEffects;
-+        })).apply(instance, (climateSettings, biomeCategory, float_, float2, biomeSpecialEffects) -> {
-+            return new Biome(climateSettings, biomeCategory, float_, float2, biomeSpecialEffects, BiomeGenerationSettings.EMPTY, MobSpawnSettings.EMPTY);
++        })).apply(instance, (climateSettings, biomeCategory, biomeSpecialEffects) -> {
++            return new Biome(climateSettings, biomeCategory, biomeSpecialEffects, BiomeGenerationSettings.EMPTY, MobSpawnSettings.EMPTY);
 +        });
 +    });
 +    // Paper end
      public static final Codec<Supplier<Biome>> CODEC = RegistryFileCodec.create(Registry.BIOME_REGISTRY, DIRECT_CODEC);
      public static final Codec<List<Supplier<Biome>>> LIST_CODEC = RegistryFileCodec.homogeneousList(Registry.BIOME_REGISTRY, DIRECT_CODEC);
-     private final Map<Integer, List<StructureFeature<?>>> structuresByStep = Registry.STRUCTURE_FEATURE.stream().collect(Collectors.groupingBy((structureFeature) -> {
+     private static final PerlinSimplexNoise TEMPERATURE_NOISE = new PerlinSimplexNoise(new WorldgenRandom(new LegacyRandomSource(1234L)), ImmutableList.of(0));
 @@ -0,0 +0,0 @@ public final class Biome {
          return resourceLocation == null ? super.toString() : resourceLocation.toString();
      }
@@ -317,10 +287,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                return biome.climateSettings;
 -            }), Biome.BiomeCategory.CODEC.fieldOf("category").forGetter((biome) -> {
 -                return biome.biomeCategory;
--            }), Codec.FLOAT.fieldOf("depth").forGetter((biome) -> {
--                return biome.depth;
--            }), Codec.FLOAT.fieldOf("scale").forGetter((biome) -> {
--                return biome.scale;
 -            }), BiomeSpecialEffects.CODEC.fieldOf("effects").forGetter((biome) -> {
 -                return biome.specialEffects;
 -            }), BiomeGenerationSettings.CODEC.forGetter((biome) -> {
@@ -334,14 +300,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                return biome.climateSettings;
 -            }), Biome.BiomeCategory.CODEC.fieldOf("category").forGetter((biome) -> {
 -                return biome.biomeCategory;
--            }), Codec.FLOAT.fieldOf("depth").forGetter((biome) -> {
--                return biome.depth;
--            }), Codec.FLOAT.fieldOf("scale").forGetter((biome) -> {
--                return biome.scale;
 -            }), BiomeSpecialEffects.CODEC.fieldOf("effects").forGetter((biome) -> {
 -                return biome.specialEffects;
--            })).apply(instance, (climateSettings, biomeCategory, float_, float2, biomeSpecialEffects) -> {
--                return new Biome(climateSettings, biomeCategory, float_, float2, biomeSpecialEffects, BiomeGenerationSettings.EMPTY, MobSpawnSettings.EMPTY);
+-            })).apply(instance, (climateSettings, biomeCategory, biomeSpecialEffects) -> {
+-                return new Biome(climateSettings, biomeCategory, biomeSpecialEffects, BiomeGenerationSettings.EMPTY, MobSpawnSettings.EMPTY);
 -            });
 -        });
 -    }
@@ -349,23 +311,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public static class BiomeBuilder {
          @Nullable
          private Biome.Precipitation precipitation;
-diff --git a/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java b/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java
-+++ b/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java
-@@ -0,0 +0,0 @@ import com.google.common.collect.Lists;
- import com.google.common.collect.Maps;
- import java.util.Arrays;
- import java.util.Collection;
-+import java.util.Iterator;
- import java.util.Map;
- import java.util.Optional;
- import java.util.function.Predicate;
-@@ -0,0 +0,0 @@ public class EnumProperty<T extends Enum<T> & StringRepresentable> extends Prope
-     protected EnumProperty(String name, Class<T> type, Collection<T> values) {
-         super(name, type);
-         this.values = ImmutableSet.copyOf(values);
-+        Iterator<T> iterator = values.iterator(); // Paper - decompile fix
- 
-         for(T enum_ : values) {
-             String string = enum_.getSerializedName();
diff --git a/patches/server/Paper-config-files.patch b/patches/server/Paper-config-files.patch
index 978715103a..64f4f1a2a4 100644
--- a/patches/server/Paper-config-files.patch
+++ b/patches/server/Paper-config-files.patch
@@ -619,9 +619,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +    // Paper end
 +
-     public static void forceUpgrade(LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, boolean eraseCache, BooleanSupplier booleansupplier, ImmutableSet<ResourceKey<DimensionType>> worlds) { // CraftBukkit
+     public static void forceUpgrade(LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, boolean eraseCache, BooleanSupplier continueCheck, WorldGenSettings generatorOptions) {
          Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit
-         WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, worlds, eraseCache);
+         WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, generatorOptions, eraseCache);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -631,7 +631,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          this.forceDifficulty();
          for (ServerLevel worldserver : this.getAllLevels()) {
 +            worldserver.paperConfig.removeOldValues(); // Paper - callback for clearing old config options, after any migrations have taken place
-             this.loadSpawn(worldserver.getChunkSource().chunkMap.progressListener, worldserver);
+             this.prepareLevels(worldserver.getChunkSource().chunkMap.progressListener, worldserver);
              worldserver.entityManager.tick(); // SPIGOT-6526: Load pending entities so they are available to the API
              this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldLoadEvent(worldserver.getWorld()));
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -669,27 +669,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    // Paper end
 +
      public boolean isPositionTicking(long pos) {
-         return this.checkChunkFuture(pos, (Function<ChunkHolder, CompletableFuture<Either<LevelChunk, ChunkHolder.ChunkLoadingFailure>>>) ChunkHolder::getTickingChunkFuture); // CraftBukkit - decompile error
-     }
+         ChunkHolder playerchunk = this.getVisibleChunkIfPresent(pos);
+ 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
-@@ -0,0 +0,0 @@ import com.google.common.collect.ImmutableSet;
- import java.util.List;
- import java.util.Optional;
- import java.util.Spliterator;
-+import java.util.Set; // Paper
- import java.util.UUID;
- import java.util.function.Consumer;
- import java.util.function.Function;
 @@ -0,0 +0,0 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
  
          T create(EntityType<T> type, Level world);
      }
 +
 +    // Paper start
-+    public static Set<ResourceLocation> getEntityNameList() {
++    public static java.util.Set<ResourceLocation> getEntityNameList() {
 +        return Registry.ENTITY_TYPE.keySet();
 +    }
 +    // Paper end
diff --git a/patches/server/Remap-fixes.patch b/patches/server/Remap-fixes.patch
index 1998d582c6..648545218f 100644
--- a/patches/server/Remap-fixes.patch
+++ b/patches/server/Remap-fixes.patch
@@ -67,25 +67,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          return optional.map((uuid) -> {
              return ((ServerLevel) entity.level).getEntity(uuid);
 -        }).map((entity) -> {
--            return entity instanceof LivingEntity ? (LivingEntity) entity : null;
-+        }).map((entity2) -> { // Paper - remap fix
-+            return entity2 instanceof LivingEntity ? (LivingEntity) entity2 : null; // Paper - remap fix
-         });
-     }
++        }).map((entity1) -> { // Paper - remap fix
+             LivingEntity entityliving1;
  
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-@@ -0,0 +0,0 @@ public class Phantom extends FlyingMob implements Enemy {
-                 List<Player> list = Phantom.this.level.getNearbyPlayers(this.attackTargeting, (LivingEntity) Phantom.this, Phantom.this.getBoundingBox().inflate(16.0D, 64.0D, 16.0D));
+-            if (entity instanceof LivingEntity) {
+-                LivingEntity entityliving2 = (LivingEntity) entity;
++            if (entity1 instanceof LivingEntity) { // Paper - remap fix
++                LivingEntity entityliving2 = (LivingEntity) entity1; // Paper - remap fix
  
-                 if (!list.isEmpty()) {
--                    list.sort(Comparator.comparing(Entity::getY).reversed());
-+                    list.sort(Comparator.<Player, Double>comparing(Entity::getY).reversed()); // Paper - remap fix
-                     Iterator iterator = list.iterator();
- 
-                     while (iterator.hasNext()) {
+                 entityliving1 = entityliving2;
+             } else {
 diff --git a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
@@ -129,19 +120,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          assertThat(color, is(Color.fromRGB(nmsColor)));
      }
  }
-diff --git a/src/test/java/org/bukkit/PerMaterialTest.java b/src/test/java/org/bukkit/PerMaterialTest.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/test/java/org/bukkit/PerMaterialTest.java
-+++ b/src/test/java/org/bukkit/PerMaterialTest.java
-@@ -0,0 +0,0 @@ public class PerMaterialTest extends AbstractTestingBase {
-         if (this.material.isBlock()) {
-             assertThat(this.material.isInteractable(),
-                     is(!CraftMagicNumbers.getBlock(material).getClass()
--                            .getMethod("interact", BlockState.class, net.minecraft.world.level.Level.class, BlockPos.class, Player.class, InteractionHand.class, BlockHitResult.class)
-+                            .getMethod("use", BlockState.class, net.minecraft.world.level.Level.class, BlockPos.class, Player.class, InteractionHand.class, BlockHitResult.class) // Paper - remap fix
-                             .getDeclaringClass().equals(BlockBehaviour.class)));
-         } else {
-             assertFalse(this.material.isInteractable());
 diff --git a/src/test/java/org/bukkit/entity/EntityTypesTest.java b/src/test/java/org/bukkit/entity/EntityTypesTest.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/test/java/org/bukkit/entity/EntityTypesTest.java
diff --git a/patches/server/Setup-Gradle-project.patch b/patches/server/Setup-Gradle-project.patch
index 5f2729dfd0..788c186fb8 100644
--- a/patches/server/Setup-Gradle-project.patch
+++ b/patches/server/Setup-Gradle-project.patch
@@ -59,8 +59,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        // This includes junit transitively for whatever reason
 +        isTransitive = false
 +    }
-+    runtimeOnly("org.xerial:sqlite-jdbc:3.34.0")
-+    runtimeOnly("mysql:mysql-connector-java:5.1.49")
++    runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
++    runtimeOnly("mysql:mysql-connector-java:8.0.27")
 +
 +    runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.1")
 +    runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
@@ -105,35 +105,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +relocation {
 +    // Order matters here - e.g. craftbukkit proper must be relocated before any of the libs are relocated into the cb package
-+    val packageVersion = "1_17_R1"
++    val packageVersion = "1_18_R1"
 +    relocate("org.bukkit.craftbukkit" to "org.bukkit.craftbukkit.v$packageVersion") {
 +        exclude("org.bukkit.craftbukkit.Main*")
 +    }
-+
-+    fun cb(pack: String) = "org.bukkit.craftbukkit.libs.$pack"
-+
-+    relocate("org.jline:jline-terminal-jansi", "org.jline" to cb("jline"))
-+    sequenceOf(
-+        "commons-codec:commons-codec" to "org.apache.commons.codec",
-+        "commons-io:commons-io" to "org.apache.commons.io",
-+        "it.unimi.dsi:fastutil" to "it.unimi",
-+        "org.apache.commons:commons-lang3" to "org.apache.commons.lang3",
-+        "org.ow2.asm:asm" to "org.objectweb.asm"
-+    ).forEach { (owner, pack) ->
-+        relocate(owner, pack to cb(pack))
-+    }
-+
-+    // runtimeOnly dependencies don't need an owner attached
-+    // owner is used for dev bundle generation, runtimeOnly deps are not included in dev bundle
-+    sequenceOf(
-+        "org.apache.http",
-+        "org.apache.maven",
-+        "org.codehaus.plexus",
-+        "org.eclipse.aether",
-+        "org.eclipse.sisu"
-+    ).forEach { pack ->
-+        relocate(pack to cb(pack))
-+    }
 +}
 +
 +tasks.shadowJar {
@@ -166,7 +141,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    if (rootProject.childProjects["test-plugin"] != null) {
 +        val testPluginJar = rootProject.project(":test-plugin").tasks.jar.flatMap { it.archiveFile }
 +        inputs.file(testPluginJar)
-+        args("-add-plugin=${testPluginJar.get().asFile.absolutePath}")
++        // args("-add-plugin=${testPluginJar.get().asFile.absolutePath}") // todo - uncomment
 +    }
 +
 +    args("--nogui")
@@ -214,20 +189,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot</artifactId>
 -    <packaging>jar</packaging>
--    <version>1.17.1-R0.1-SNAPSHOT</version>
+-    <version>1.18-pre5-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>https://www.spigotmc.org/</url>
 -
--    <properties>
--        <skipTests>true</skipTests>
--        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
--        <api.version>unknown</api.version>
--        <bt.name>git</bt.name>
--        <minecraft_version>1_17_R1</minecraft_version>
--        <maven.compiler.source>1.8</maven.compiler.source>
--        <maven.compiler.target>1.8</maven.compiler.target>
--    </properties>
--
 -    <parent>
 -        <groupId>org.spigotmc</groupId>
 -        <artifactId>spigot-parent</artifactId>
@@ -235,6 +200,24 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -        <relativePath>../pom.xml</relativePath>
 -    </parent>
 -
+-    <properties>
+-        <skipTests>true</skipTests>
+-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+-        <api.version>unknown</api.version>
+-        <bt.name>git</bt.name>
+-        <minecraft_version>1_18_R1</minecraft_version>
+-        <maven.compiler.source>16</maven.compiler.source>
+-        <maven.compiler.target>16</maven.compiler.target>
+-    </properties>
+-
+-    <repositories>
+-        <repository>
+-            <id>minecraft-libraries</id>
+-            <name>Minecraft Libraries</name>
+-            <url>https://libraries.minecraft.net/</url>
+-        </repository>
+-    </repositories>
+-
 -    <dependencies>
 -        <dependency>
 -            <groupId>org.spigotmc</groupId>
@@ -259,13 +242,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -            <artifactId>log4j-iostreams</artifactId>
 -            <version>2.14.1</version>
 -            <scope>compile</scope>
--            <exclusions>
--                <!-- included in minecraft-server -->
--                <exclusion>
--                    <groupId>org.apache.logging.log4j</groupId>
--                    <artifactId>log4j-api</artifactId>
--                </exclusion>
--            </exclusions>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.ow2.asm</groupId>
@@ -273,6 +249,85 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -            <version>9.2</version>
 -            <scope>compile</scope>
 -        </dependency>
+-        <!-- Mojang depends -->
+-        <dependency>
+-            <groupId>com.github.oshi</groupId>
+-            <artifactId>oshi-core</artifactId>
+-            <version>5.8.2</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>com.mojang</groupId>
+-            <artifactId>authlib</artifactId>
+-            <version>3.2.38</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>com.mojang</groupId>
+-            <artifactId>brigadier</artifactId>
+-            <version>1.0.18</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>com.mojang</groupId>
+-            <artifactId>datafixerupper</artifactId>
+-            <version>4.0.26</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>com.mojang</groupId>
+-            <artifactId>javabridge</artifactId>
+-            <version>1.2.24</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>commons-io</groupId>
+-            <artifactId>commons-io</artifactId>
+-            <version>2.11.0</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>io.netty</groupId>
+-            <artifactId>netty-all</artifactId>
+-            <version>4.1.68.Final</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>it.unimi.dsi</groupId>
+-            <artifactId>fastutil</artifactId>
+-            <version>8.5.6</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>net.sf.jopt-simple</groupId>
+-            <artifactId>jopt-simple</artifactId>
+-            <version>5.0.4</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.apache.commons</groupId>
+-            <artifactId>commons-lang3</artifactId>
+-            <version>3.12.0</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.apache.logging.log4j</groupId>
+-            <artifactId>log4j-core</artifactId>
+-            <version>2.14.1</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.apache.logging.log4j</groupId>
+-            <artifactId>log4j-slf4j18-impl</artifactId>
+-            <version>2.14.1</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.slf4j</groupId>
+-            <artifactId>slf4j-api</artifactId>
+-            <version>1.8.0-beta4</version>
+-            <scope>compile</scope>
+-        </dependency>
 -        <!-- deprecated API depend -->
 -        <dependency>
 -            <groupId>com.googlecode.json-simple</groupId>
@@ -283,13 +338,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.xerial</groupId>
 -            <artifactId>sqlite-jdbc</artifactId>
--            <version>3.34.0</version>
+-            <version>3.36.0.3</version>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>mysql</groupId>
 -            <artifactId>mysql-connector-java</artifactId>
--            <version>5.1.49</version>
+-            <version>8.0.27</version>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <!-- add these back in as they are not exposed by the API -->
@@ -439,87 +494,21 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                        </goals>
 -                        <configuration>
 -                            <createSourcesJar>${shadeSourcesJar}</createSourcesJar>
--                            <filters>
--                                <filter>
--                                    <artifact>org.spigotmc:minecraft-server</artifact>
--                                    <excludes>
--                                        <exclude>com/google/common/**</exclude>
--                                        <exclude>com/google/gson/**</exclude>
--                                        <exclude>com/google/thirdparty/**</exclude>
--                                    </excludes>
--                                </filter>
--                                <filter>
--                                    <artifact>org.eclipse.sisu:org.eclipse.sisu.inject</artifact>
--                                    <excludes>
--                                        <exclude>META-INF/services/javax.annotation.processing.Processor</exclude>
--                                    </excludes>
--                                </filter>
--                            </filters>
+-                            <artifactSet>
+-                                <includes>
+-                                    <include>org.spigotmc:minecraft-server</include>
+-                                </includes>
+-                            </artifactSet>
 -                            <relocations>
--                                <!-- Cannot be relocated as it breaks translation property keys -->
--                                <!--
--                                <relocation>
--                                    <pattern>joptsimple</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.joptsimple</shadedPattern>
--                                </relocation>
--                                -->
--                                <relocation>
--                                    <pattern>jline</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.jline</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>it.unimi</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.it.unimi</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.apache.commons.codec</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.commons.codec</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.apache.commons.io</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.commons.io</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.apache.commons.lang3</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.commons.lang3</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.apache.http</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.http</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.apache.maven</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.maven</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.codehaus.plexus</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.codehaus.plexus</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.eclipse.aether</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.eclipse.aether</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.eclipse.sisu</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.eclipse.sisu</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.objectweb.asm</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.objectweb.asm</shadedPattern>
--                                </relocation>
 -                                <relocation>
 -                                    <pattern>org.bukkit.craftbukkit</pattern>
 -                                    <shadedPattern>org.bukkit.craftbukkit.v${minecraft_version}</shadedPattern>
 -                                    <excludes>
+-                                        <exclude>org.bukkit.craftbukkit.bootstrap.*</exclude>
 -                                        <exclude>org.bukkit.craftbukkit.Main*</exclude>
 -                                    </excludes>
 -                                </relocation>
 -                            </relocations>
--                            <transformers>
--                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
--                                    <resource>META-INF/services/java.sql.Driver</resource>
--                                </transformer>
--                            </transformers>
 -                        </configuration>
 -                    </execution>
 -                </executions>
@@ -527,22 +516,75 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -            <plugin>
 -                <groupId>net.md-5</groupId>
 -                <artifactId>specialsource-maven-plugin</artifactId>
--                <version>1.2.2</version>
+-                <version>1.2.3</version>
 -                <executions>
 -                    <execution>
 -                        <phase>package</phase>
 -                        <goals>
 -                            <goal>remap</goal>
 -                        </goals>
--                        <id>remap-fields</id>
+-                        <id>remap-members</id>
 -                        <configuration>
--                            <srgIn>org.spigotmc:minecraft-server:${project.version}:csrg:maps-spigot-fields</srgIn>
+-                            <logFile>${project.build.directory}/server.txt</logFile>
+-                            <srgIn>org.spigotmc:minecraft-server:${project.version}:csrg:maps-spigot-members</srgIn>
 -                            <reverse>true</reverse>
 -                        </configuration>
 -                    </execution>
 -                </executions>
 -            </plugin>
 -            <plugin>
+-                <groupId>net.nicoulaj.maven.plugins</groupId>
+-                <artifactId>checksum-maven-plugin</artifactId>
+-                <version>1.11</version>
+-                <executions>
+-                    <execution>
+-                        <phase>package</phase>
+-                        <goals>
+-                            <goal>artifacts</goal>
+-                            <goal>dependencies</goal>
+-                        </goals>
+-                        <configuration>
+-                            <algorithms>
+-                                <algorithm>SHA-256</algorithm>
+-                            </algorithms>
+-                            <scopes>
+-                                <scope>compile</scope>
+-                                <scope>runtime</scope>
+-                            </scopes>
+-                            <shasumSummary>true</shasumSummary>
+-                            <transitive>true</transitive>
+-                        </configuration>
+-                    </execution>
+-                </executions>
+-            </plugin>
+-            <plugin>
+-                <groupId>org.apache.maven.plugins</groupId>
+-                <artifactId>maven-assembly-plugin</artifactId>
+-                <version>3.3.0</version>
+-                <executions>
+-                    <execution>
+-                        <phase>package</phase>
+-                        <goals>
+-                            <goal>single</goal>
+-                        </goals>
+-                        <configuration>
+-                            <appendAssemblyId>false</appendAssemblyId>
+-                            <archive>
+-                                <manifest>
+-                                    <addDefaultEntries>false</addDefaultEntries>
+-                                </manifest>
+-                                <manifestEntries>
+-                                    <Main-Class>org.bukkit.craftbukkit.bootstrap.Main</Main-Class>
+-                                </manifestEntries>
+-                            </archive>
+-                            <descriptors>
+-                                <descriptor>${project.basedir}/src/assembly/bootstrap.xml</descriptor>
+-                            </descriptors>
+-                        </configuration>
+-                    </execution>
+-                </executions>
+-            </plugin>
+-            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-compiler-plugin</artifactId>
 -                <version>3.8.1</version>
@@ -559,7 +601,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                    <dependency>
 -                        <groupId>org.eclipse.jdt</groupId>
 -                        <artifactId>ecj</artifactId>
--                        <version>3.26.0</version>
+-                        <version>3.27.0</version>
 -                    </dependency>
 -                </dependencies>
 -            </plugin>
@@ -612,7 +654,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                            <dependency>
 -                                <groupId>com.puppycrawl.tools</groupId>
 -                                <artifactId>checkstyle</artifactId>
--                                <version>8.44</version>
+-                                <version>8.45.1</version>
 -                            </dependency>
 -                        </dependencies>
 -                    </plugin>
@@ -624,7 +666,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                            <execution>
 -                                <phase>process-classes</phase>
 -                                <goals>
--                                    <goal>check</goal>
+-                                    <!--<goal>check</goal>-->
 -                                </goals>
 -                            </execution>
 -                        </executions>
diff --git a/patches/api/API-to-get-a-BlockState-without-a-snapshot.patch b/patches/unapplied/api/API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 100%
rename from patches/api/API-to-get-a-BlockState-without-a-snapshot.patch
rename to patches/unapplied/api/API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/patches/api/Ability-to-apply-mending-to-XP-API.patch b/patches/unapplied/api/Ability-to-apply-mending-to-XP-API.patch
similarity index 100%
rename from patches/api/Ability-to-apply-mending-to-XP-API.patch
rename to patches/unapplied/api/Ability-to-apply-mending-to-XP-API.patch
diff --git a/patches/api/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/unapplied/api/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 100%
rename from patches/api/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to patches/unapplied/api/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
diff --git a/patches/api/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/unapplied/api/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 100%
rename from patches/api/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to patches/unapplied/api/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/api/Add-API-for-quit-reason.patch b/patches/unapplied/api/Add-API-for-quit-reason.patch
similarity index 100%
rename from patches/api/Add-API-for-quit-reason.patch
rename to patches/unapplied/api/Add-API-for-quit-reason.patch
diff --git a/patches/api/Add-API-for-resetting-a-single-score.patch b/patches/unapplied/api/Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/api/Add-API-for-resetting-a-single-score.patch
rename to patches/unapplied/api/Add-API-for-resetting-a-single-score.patch
diff --git a/patches/api/Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/unapplied/api/Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 100%
rename from patches/api/Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to patches/unapplied/api/Add-API-methods-to-control-if-armour-stands-can-move.patch
diff --git a/patches/api/Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/unapplied/api/Add-API-to-get-Material-from-Boats-and-Minecarts.patch
similarity index 100%
rename from patches/api/Add-API-to-get-Material-from-Boats-and-Minecarts.patch
rename to patches/unapplied/api/Add-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/api/Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/unapplied/api/Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
similarity index 100%
rename from patches/api/Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
rename to patches/unapplied/api/Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
diff --git a/patches/api/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/unapplied/api/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 100%
rename from patches/api/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to patches/unapplied/api/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/api/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/unapplied/api/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/api/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/unapplied/api/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/api/Add-ArmorStand-Item-Meta.patch b/patches/unapplied/api/Add-ArmorStand-Item-Meta.patch
similarity index 100%
rename from patches/api/Add-ArmorStand-Item-Meta.patch
rename to patches/unapplied/api/Add-ArmorStand-Item-Meta.patch
diff --git a/patches/api/Add-Ban-Methods-to-Player-Objects.patch b/patches/unapplied/api/Add-Ban-Methods-to-Player-Objects.patch
similarity index 100%
rename from patches/api/Add-Ban-Methods-to-Player-Objects.patch
rename to patches/unapplied/api/Add-Ban-Methods-to-Player-Objects.patch
diff --git a/patches/api/Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/patches/unapplied/api/Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
similarity index 100%
rename from patches/api/Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
rename to patches/unapplied/api/Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
diff --git a/patches/api/Add-BeaconEffectEvent.patch b/patches/unapplied/api/Add-BeaconEffectEvent.patch
similarity index 100%
rename from patches/api/Add-BeaconEffectEvent.patch
rename to patches/unapplied/api/Add-BeaconEffectEvent.patch
diff --git a/patches/api/Add-BellRevealRaiderEvent.patch b/patches/unapplied/api/Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/api/Add-BellRevealRaiderEvent.patch
rename to patches/unapplied/api/Add-BellRevealRaiderEvent.patch
diff --git a/patches/api/Add-BellRingEvent.patch b/patches/unapplied/api/Add-BellRingEvent.patch
similarity index 100%
rename from patches/api/Add-BellRingEvent.patch
rename to patches/unapplied/api/Add-BellRingEvent.patch
diff --git a/patches/api/Add-Block-isValidTool.patch b/patches/unapplied/api/Add-Block-isValidTool.patch
similarity index 100%
rename from patches/api/Add-Block-isValidTool.patch
rename to patches/unapplied/api/Add-Block-isValidTool.patch
diff --git a/patches/api/Add-BlockBreakBlockEvent.patch b/patches/unapplied/api/Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/api/Add-BlockBreakBlockEvent.patch
rename to patches/unapplied/api/Add-BlockBreakBlockEvent.patch
diff --git a/patches/api/Add-BlockFailedDispenseEvent.patch b/patches/unapplied/api/Add-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/api/Add-BlockFailedDispenseEvent.patch
rename to patches/unapplied/api/Add-BlockFailedDispenseEvent.patch
diff --git a/patches/api/Add-BlockPreDispenseEvent.patch b/patches/unapplied/api/Add-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/api/Add-BlockPreDispenseEvent.patch
rename to patches/unapplied/api/Add-BlockPreDispenseEvent.patch
diff --git a/patches/api/Add-BlockSoundGroup-interface.patch b/patches/unapplied/api/Add-BlockSoundGroup-interface.patch
similarity index 100%
rename from patches/api/Add-BlockSoundGroup-interface.patch
rename to patches/unapplied/api/Add-BlockSoundGroup-interface.patch
diff --git a/patches/api/Add-Destroy-Speed-API.patch b/patches/unapplied/api/Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/api/Add-Destroy-Speed-API.patch
rename to patches/unapplied/api/Add-Destroy-Speed-API.patch
diff --git a/patches/api/Add-ElderGuardianAppearanceEvent.patch b/patches/unapplied/api/Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/api/Add-ElderGuardianAppearanceEvent.patch
rename to patches/unapplied/api/Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/api/Add-EntityBlockStorage-clearEntities.patch b/patches/unapplied/api/Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/api/Add-EntityBlockStorage-clearEntities.patch
rename to patches/unapplied/api/Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/api/Add-EntityInsideBlockEvent.patch b/patches/unapplied/api/Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/api/Add-EntityInsideBlockEvent.patch
rename to patches/unapplied/api/Add-EntityInsideBlockEvent.patch
diff --git a/patches/api/Add-EntityKnockbackByEntityEvent.patch b/patches/unapplied/api/Add-EntityKnockbackByEntityEvent.patch
similarity index 100%
rename from patches/api/Add-EntityKnockbackByEntityEvent.patch
rename to patches/unapplied/api/Add-EntityKnockbackByEntityEvent.patch
diff --git a/patches/api/Add-EntityLoadCrossbowEvent.patch b/patches/unapplied/api/Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/api/Add-EntityLoadCrossbowEvent.patch
rename to patches/unapplied/api/Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/api/Add-EntityTeleportEndGatewayEvent.patch b/patches/unapplied/api/Add-EntityTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/api/Add-EntityTeleportEndGatewayEvent.patch
rename to patches/unapplied/api/Add-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/api/Add-EntityZapEvent.patch b/patches/unapplied/api/Add-EntityZapEvent.patch
similarity index 100%
rename from patches/api/Add-EntityZapEvent.patch
rename to patches/unapplied/api/Add-EntityZapEvent.patch
diff --git a/patches/api/Add-GS4-Query-event.patch b/patches/unapplied/api/Add-GS4-Query-event.patch
similarity index 100%
rename from patches/api/Add-GS4-Query-event.patch
rename to patches/unapplied/api/Add-GS4-Query-event.patch
diff --git a/patches/api/Add-Git-information-to-version-command-on-startup.patch b/patches/unapplied/api/Add-Git-information-to-version-command-on-startup.patch
similarity index 100%
rename from patches/api/Add-Git-information-to-version-command-on-startup.patch
rename to patches/unapplied/api/Add-Git-information-to-version-command-on-startup.patch
diff --git a/patches/api/Add-Heightmap-API.patch b/patches/unapplied/api/Add-Heightmap-API.patch
similarity index 100%
rename from patches/api/Add-Heightmap-API.patch
rename to patches/unapplied/api/Add-Heightmap-API.patch
diff --git a/patches/api/Add-ItemFactory-getMonsterEgg-API.patch b/patches/unapplied/api/Add-ItemFactory-getMonsterEgg-API.patch
similarity index 100%
rename from patches/api/Add-ItemFactory-getMonsterEgg-API.patch
rename to patches/unapplied/api/Add-ItemFactory-getMonsterEgg-API.patch
diff --git a/patches/api/Add-ItemStack-Recipe-API-helper-methods.patch b/patches/unapplied/api/Add-ItemStack-Recipe-API-helper-methods.patch
similarity index 100%
rename from patches/api/Add-ItemStack-Recipe-API-helper-methods.patch
rename to patches/unapplied/api/Add-ItemStack-Recipe-API-helper-methods.patch
diff --git a/patches/api/Add-ItemStackRecipeChoice-Draft-API.patch b/patches/unapplied/api/Add-ItemStackRecipeChoice-Draft-API.patch
similarity index 100%
rename from patches/api/Add-ItemStackRecipeChoice-Draft-API.patch
rename to patches/unapplied/api/Add-ItemStackRecipeChoice-Draft-API.patch
diff --git a/patches/api/Add-LivingEntity-clearActiveItem.patch b/patches/unapplied/api/Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/api/Add-LivingEntity-clearActiveItem.patch
rename to patches/unapplied/api/Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/api/Add-LivingEntity-getTargetEntity.patch b/patches/unapplied/api/Add-LivingEntity-getTargetEntity.patch
similarity index 100%
rename from patches/api/Add-LivingEntity-getTargetEntity.patch
rename to patches/unapplied/api/Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/api/Add-Material-Tags.patch b/patches/unapplied/api/Add-Material-Tags.patch
similarity index 100%
rename from patches/api/Add-Material-Tags.patch
rename to patches/unapplied/api/Add-Material-Tags.patch
diff --git a/patches/api/Add-MetadataStoreBase.removeAll-Plugin.patch b/patches/unapplied/api/Add-MetadataStoreBase.removeAll-Plugin.patch
similarity index 100%
rename from patches/api/Add-MetadataStoreBase.removeAll-Plugin.patch
rename to patches/unapplied/api/Add-MetadataStoreBase.removeAll-Plugin.patch
diff --git a/patches/api/Add-Mob-Goal-API.patch b/patches/unapplied/api/Add-Mob-Goal-API.patch
similarity index 100%
rename from patches/api/Add-Mob-Goal-API.patch
rename to patches/unapplied/api/Add-Mob-Goal-API.patch
diff --git a/patches/api/Add-Mob-lookAt-API.patch b/patches/unapplied/api/Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/api/Add-Mob-lookAt-API.patch
rename to patches/unapplied/api/Add-Mob-lookAt-API.patch
diff --git a/patches/api/Add-More-Creeper-API.patch b/patches/unapplied/api/Add-More-Creeper-API.patch
similarity index 100%
rename from patches/api/Add-More-Creeper-API.patch
rename to patches/unapplied/api/Add-More-Creeper-API.patch
diff --git a/patches/api/Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/unapplied/api/Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/api/Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/unapplied/api/Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/api/Add-PhantomPreSpawnEvent.patch b/patches/unapplied/api/Add-PhantomPreSpawnEvent.patch
similarity index 100%
rename from patches/api/Add-PhantomPreSpawnEvent.patch
rename to patches/unapplied/api/Add-PhantomPreSpawnEvent.patch
diff --git a/patches/api/Add-Player-Client-Options-API.patch b/patches/unapplied/api/Add-Player-Client-Options-API.patch
similarity index 100%
rename from patches/api/Add-Player-Client-Options-API.patch
rename to patches/unapplied/api/Add-Player-Client-Options-API.patch
diff --git a/patches/api/Add-PlayerArmorChangeEvent.patch b/patches/unapplied/api/Add-PlayerArmorChangeEvent.patch
similarity index 100%
rename from patches/api/Add-PlayerArmorChangeEvent.patch
rename to patches/unapplied/api/Add-PlayerArmorChangeEvent.patch
diff --git a/patches/api/Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/unapplied/api/Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from patches/api/Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/unapplied/api/Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/api/Add-PlayerConnectionCloseEvent.patch b/patches/unapplied/api/Add-PlayerConnectionCloseEvent.patch
similarity index 100%
rename from patches/api/Add-PlayerConnectionCloseEvent.patch
rename to patches/unapplied/api/Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/api/Add-PlayerFlowerPotManipulateEvent.patch b/patches/unapplied/api/Add-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/api/Add-PlayerFlowerPotManipulateEvent.patch
rename to patches/unapplied/api/Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/api/Add-PlayerInitialSpawnEvent.patch b/patches/unapplied/api/Add-PlayerInitialSpawnEvent.patch
similarity index 100%
rename from patches/api/Add-PlayerInitialSpawnEvent.patch
rename to patches/unapplied/api/Add-PlayerInitialSpawnEvent.patch
diff --git a/patches/api/Add-PlayerItemCooldownEvent.patch b/patches/unapplied/api/Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/api/Add-PlayerItemCooldownEvent.patch
rename to patches/unapplied/api/Add-PlayerItemCooldownEvent.patch
diff --git a/patches/api/Add-PlayerJumpEvent.patch b/patches/unapplied/api/Add-PlayerJumpEvent.patch
similarity index 100%
rename from patches/api/Add-PlayerJumpEvent.patch
rename to patches/unapplied/api/Add-PlayerJumpEvent.patch
diff --git a/patches/api/Add-PlayerKickEvent-causes.patch b/patches/unapplied/api/Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/api/Add-PlayerKickEvent-causes.patch
rename to patches/unapplied/api/Add-PlayerKickEvent-causes.patch
diff --git a/patches/api/Add-PlayerLocaleChangeEvent.patch b/patches/unapplied/api/Add-PlayerLocaleChangeEvent.patch
similarity index 100%
rename from patches/api/Add-PlayerLocaleChangeEvent.patch
rename to patches/unapplied/api/Add-PlayerLocaleChangeEvent.patch
diff --git a/patches/api/Add-PlayerPostRespawnEvent.patch b/patches/unapplied/api/Add-PlayerPostRespawnEvent.patch
similarity index 100%
rename from patches/api/Add-PlayerPostRespawnEvent.patch
rename to patches/unapplied/api/Add-PlayerPostRespawnEvent.patch
diff --git a/patches/api/Add-PlayerSetSpawnEvent.patch b/patches/unapplied/api/Add-PlayerSetSpawnEvent.patch
similarity index 100%
rename from patches/api/Add-PlayerSetSpawnEvent.patch
rename to patches/unapplied/api/Add-PlayerSetSpawnEvent.patch
diff --git a/patches/api/Add-PlayerShearBlockEvent.patch b/patches/unapplied/api/Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/api/Add-PlayerShearBlockEvent.patch
rename to patches/unapplied/api/Add-PlayerShearBlockEvent.patch
diff --git a/patches/api/Add-PlayerSignCommandPreprocessEvent.patch b/patches/unapplied/api/Add-PlayerSignCommandPreprocessEvent.patch
similarity index 100%
rename from patches/api/Add-PlayerSignCommandPreprocessEvent.patch
rename to patches/unapplied/api/Add-PlayerSignCommandPreprocessEvent.patch
diff --git a/patches/api/Add-PlayerUseUnknownEntityEvent.patch b/patches/unapplied/api/Add-PlayerUseUnknownEntityEvent.patch
similarity index 100%
rename from patches/api/Add-PlayerUseUnknownEntityEvent.patch
rename to patches/unapplied/api/Add-PlayerUseUnknownEntityEvent.patch
diff --git a/patches/api/Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/patches/unapplied/api/Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
similarity index 100%
rename from patches/api/Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
rename to patches/unapplied/api/Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
diff --git a/patches/api/Add-ProjectileCollideEvent.patch b/patches/unapplied/api/Add-ProjectileCollideEvent.patch
similarity index 100%
rename from patches/api/Add-ProjectileCollideEvent.patch
rename to patches/unapplied/api/Add-ProjectileCollideEvent.patch
diff --git a/patches/api/Add-PufferFishStateChangeEvent.patch b/patches/unapplied/api/Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/api/Add-PufferFishStateChangeEvent.patch
rename to patches/unapplied/api/Add-PufferFishStateChangeEvent.patch
diff --git a/patches/api/Add-Raw-Byte-Entity-Serialization.patch b/patches/unapplied/api/Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/api/Add-Raw-Byte-Entity-Serialization.patch
rename to patches/unapplied/api/Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/api/Add-Raw-Byte-ItemStack-Serialization.patch b/patches/unapplied/api/Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from patches/api/Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/unapplied/api/Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/api/Add-String-based-Action-Bar-API.patch b/patches/unapplied/api/Add-String-based-Action-Bar-API.patch
similarity index 100%
rename from patches/api/Add-String-based-Action-Bar-API.patch
rename to patches/unapplied/api/Add-String-based-Action-Bar-API.patch
diff --git a/patches/api/Add-StructureLocateEvent.patch b/patches/unapplied/api/Add-StructureLocateEvent.patch
similarity index 100%
rename from patches/api/Add-StructureLocateEvent.patch
rename to patches/unapplied/api/Add-StructureLocateEvent.patch
diff --git a/patches/api/Add-TNTPrimeEvent.patch b/patches/unapplied/api/Add-TNTPrimeEvent.patch
similarity index 100%
rename from patches/api/Add-TNTPrimeEvent.patch
rename to patches/unapplied/api/Add-TNTPrimeEvent.patch
diff --git a/patches/api/Add-TargetHitEvent-API.patch b/patches/unapplied/api/Add-TargetHitEvent-API.patch
similarity index 100%
rename from patches/api/Add-TargetHitEvent-API.patch
rename to patches/unapplied/api/Add-TargetHitEvent-API.patch
diff --git a/patches/api/Add-ThrownEggHatchEvent.patch b/patches/unapplied/api/Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/api/Add-ThrownEggHatchEvent.patch
rename to patches/unapplied/api/Add-ThrownEggHatchEvent.patch
diff --git a/patches/api/Add-UnknownCommandEvent.patch b/patches/unapplied/api/Add-UnknownCommandEvent.patch
similarity index 100%
rename from patches/api/Add-UnknownCommandEvent.patch
rename to patches/unapplied/api/Add-UnknownCommandEvent.patch
diff --git a/patches/api/Add-WhitelistToggleEvent.patch b/patches/unapplied/api/Add-WhitelistToggleEvent.patch
similarity index 100%
rename from patches/api/Add-WhitelistToggleEvent.patch
rename to patches/unapplied/api/Add-WhitelistToggleEvent.patch
diff --git a/patches/api/Add-World.getEntity-UUID-API.patch b/patches/unapplied/api/Add-World.getEntity-UUID-API.patch
similarity index 100%
rename from patches/api/Add-World.getEntity-UUID-API.patch
rename to patches/unapplied/api/Add-World.getEntity-UUID-API.patch
diff --git a/patches/api/Add-a-call-helper-to-Event.patch b/patches/unapplied/api/Add-a-call-helper-to-Event.patch
similarity index 100%
rename from patches/api/Add-a-call-helper-to-Event.patch
rename to patches/unapplied/api/Add-a-call-helper-to-Event.patch
diff --git a/patches/api/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/unapplied/api/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/api/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/unapplied/api/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/api/Add-additional-open-container-api-to-HumanEntity.patch b/patches/unapplied/api/Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/api/Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/unapplied/api/Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/api/Add-advancement-display-API.patch b/patches/unapplied/api/Add-advancement-display-API.patch
similarity index 100%
rename from patches/api/Add-advancement-display-API.patch
rename to patches/unapplied/api/Add-advancement-display-API.patch
diff --git a/patches/api/Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/unapplied/api/Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
similarity index 100%
rename from patches/api/Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
rename to patches/unapplied/api/Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
diff --git a/patches/api/Add-an-asterisk-to-legacy-API-plugins.patch b/patches/unapplied/api/Add-an-asterisk-to-legacy-API-plugins.patch
similarity index 100%
rename from patches/api/Add-an-asterisk-to-legacy-API-plugins.patch
rename to patches/unapplied/api/Add-an-asterisk-to-legacy-API-plugins.patch
diff --git a/patches/api/Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/unapplied/api/Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from patches/api/Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/unapplied/api/Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/api/Add-basic-Datapack-API.patch b/patches/unapplied/api/Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/api/Add-basic-Datapack-API.patch
rename to patches/unapplied/api/Add-basic-Datapack-API.patch
diff --git a/patches/api/Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/unapplied/api/Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/api/Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/unapplied/api/Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/api/Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/unapplied/api/Add-command-line-option-to-load-extra-plugin-jars-no.patch
similarity index 100%
rename from patches/api/Add-command-line-option-to-load-extra-plugin-jars-no.patch
rename to patches/unapplied/api/Add-command-line-option-to-load-extra-plugin-jars-no.patch
diff --git a/patches/api/Add-command-to-reload-permissions.yml-and-require-co.patch b/patches/unapplied/api/Add-command-to-reload-permissions.yml-and-require-co.patch
similarity index 100%
rename from patches/api/Add-command-to-reload-permissions.yml-and-require-co.patch
rename to patches/unapplied/api/Add-command-to-reload-permissions.yml-and-require-co.patch
diff --git a/patches/api/Add-configuration-option-to-prevent-player-names-fro.patch b/patches/unapplied/api/Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 100%
rename from patches/api/Add-configuration-option-to-prevent-player-names-fro.patch
rename to patches/unapplied/api/Add-configuration-option-to-prevent-player-names-fro.patch
diff --git a/patches/api/Add-critical-damage-API.patch b/patches/unapplied/api/Add-critical-damage-API.patch
similarity index 100%
rename from patches/api/Add-critical-damage-API.patch
rename to patches/unapplied/api/Add-critical-damage-API.patch
diff --git a/patches/api/Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/unapplied/api/Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/api/Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/unapplied/api/Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/api/Add-effect-to-block-break-naturally.patch b/patches/unapplied/api/Add-effect-to-block-break-naturally.patch
similarity index 100%
rename from patches/api/Add-effect-to-block-break-naturally.patch
rename to patches/unapplied/api/Add-effect-to-block-break-naturally.patch
diff --git a/patches/api/Add-entity-liquid-API.patch b/patches/unapplied/api/Add-entity-liquid-API.patch
similarity index 100%
rename from patches/api/Add-entity-liquid-API.patch
rename to patches/unapplied/api/Add-entity-liquid-API.patch
diff --git a/patches/api/Add-exception-reporting-event.patch b/patches/unapplied/api/Add-exception-reporting-event.patch
similarity index 100%
rename from patches/api/Add-exception-reporting-event.patch
rename to patches/unapplied/api/Add-exception-reporting-event.patch
diff --git a/patches/api/Add-extended-PaperServerListPingEvent.patch b/patches/unapplied/api/Add-extended-PaperServerListPingEvent.patch
similarity index 100%
rename from patches/api/Add-extended-PaperServerListPingEvent.patch
rename to patches/unapplied/api/Add-extended-PaperServerListPingEvent.patch
diff --git a/patches/api/Add-getI18NDisplayName-API.patch b/patches/unapplied/api/Add-getI18NDisplayName-API.patch
similarity index 100%
rename from patches/api/Add-getI18NDisplayName-API.patch
rename to patches/unapplied/api/Add-getI18NDisplayName-API.patch
diff --git a/patches/api/Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/unapplied/api/Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/api/Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/unapplied/api/Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/api/Add-getNearbyXXX-methods-to-Location.patch b/patches/unapplied/api/Add-getNearbyXXX-methods-to-Location.patch
similarity index 100%
rename from patches/api/Add-getNearbyXXX-methods-to-Location.patch
rename to patches/unapplied/api/Add-getNearbyXXX-methods-to-Location.patch
diff --git a/patches/api/Add-getOfflinePlayerIfCached-String.patch b/patches/unapplied/api/Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/api/Add-getOfflinePlayerIfCached-String.patch
rename to patches/unapplied/api/Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/api/Add-getTPS-method.patch b/patches/unapplied/api/Add-getTPS-method.patch
similarity index 100%
rename from patches/api/Add-getTPS-method.patch
rename to patches/unapplied/api/Add-getTPS-method.patch
diff --git a/patches/api/Add-hand-to-bucket-events.patch b/patches/unapplied/api/Add-hand-to-bucket-events.patch
similarity index 100%
rename from patches/api/Add-hand-to-bucket-events.patch
rename to patches/unapplied/api/Add-hand-to-bucket-events.patch
diff --git a/patches/api/Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/unapplied/api/Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 100%
rename from patches/api/Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to patches/unapplied/api/Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/patches/api/Add-helpers-for-left-right-hand-to-Action.patch b/patches/unapplied/api/Add-helpers-for-left-right-hand-to-Action.patch
similarity index 100%
rename from patches/api/Add-helpers-for-left-right-hand-to-Action.patch
rename to patches/unapplied/api/Add-helpers-for-left-right-hand-to-Action.patch
diff --git a/patches/api/Add-ignore-discounts-API.patch b/patches/unapplied/api/Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/api/Add-ignore-discounts-API.patch
rename to patches/unapplied/api/Add-ignore-discounts-API.patch
diff --git a/patches/api/Add-isCollidable-methods-to-various-places.patch b/patches/unapplied/api/Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/api/Add-isCollidable-methods-to-various-places.patch
rename to patches/unapplied/api/Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/api/Add-item-slot-convenience-methods.patch b/patches/unapplied/api/Add-item-slot-convenience-methods.patch
similarity index 100%
rename from patches/api/Add-item-slot-convenience-methods.patch
rename to patches/unapplied/api/Add-item-slot-convenience-methods.patch
diff --git a/patches/api/Add-legacy-ping-support-to-PaperServerListPingEvent.patch b/patches/unapplied/api/Add-legacy-ping-support-to-PaperServerListPingEvent.patch
similarity index 100%
rename from patches/api/Add-legacy-ping-support-to-PaperServerListPingEvent.patch
rename to patches/unapplied/api/Add-legacy-ping-support-to-PaperServerListPingEvent.patch
diff --git a/patches/api/Add-method-to-open-already-placed-sign.patch b/patches/unapplied/api/Add-method-to-open-already-placed-sign.patch
similarity index 100%
rename from patches/api/Add-method-to-open-already-placed-sign.patch
rename to patches/unapplied/api/Add-method-to-open-already-placed-sign.patch
diff --git a/patches/api/Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/unapplied/api/Add-methods-for-working-with-arrows-stuck-in-living-.patch
similarity index 100%
rename from patches/api/Add-methods-for-working-with-arrows-stuck-in-living-.patch
rename to patches/unapplied/api/Add-methods-for-working-with-arrows-stuck-in-living-.patch
diff --git a/patches/api/Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/unapplied/api/Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 100%
rename from patches/api/Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/unapplied/api/Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/api/Add-methods-to-get-translation-keys.patch b/patches/unapplied/api/Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/api/Add-methods-to-get-translation-keys.patch
rename to patches/unapplied/api/Add-methods-to-get-translation-keys.patch
diff --git a/patches/api/Add-missing-effects.patch b/patches/unapplied/api/Add-missing-effects.patch
similarity index 100%
rename from patches/api/Add-missing-effects.patch
rename to patches/unapplied/api/Add-missing-effects.patch
diff --git a/patches/api/Add-missing-team-sidebar-display-slots.patch b/patches/unapplied/api/Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/api/Add-missing-team-sidebar-display-slots.patch
rename to patches/unapplied/api/Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/api/Add-moon-phase-API.patch b/patches/unapplied/api/Add-moon-phase-API.patch
similarity index 100%
rename from patches/api/Add-moon-phase-API.patch
rename to patches/unapplied/api/Add-moon-phase-API.patch
diff --git a/patches/api/Add-more-Evoker-API.patch b/patches/unapplied/api/Add-more-Evoker-API.patch
similarity index 100%
rename from patches/api/Add-more-Evoker-API.patch
rename to patches/unapplied/api/Add-more-Evoker-API.patch
diff --git a/patches/api/Add-more-LimitedRegion-API.patch b/patches/unapplied/api/Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/api/Add-more-LimitedRegion-API.patch
rename to patches/unapplied/api/Add-more-LimitedRegion-API.patch
diff --git a/patches/api/Add-more-WanderingTrader-API.patch b/patches/unapplied/api/Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/api/Add-more-WanderingTrader-API.patch
rename to patches/unapplied/api/Add-more-WanderingTrader-API.patch
diff --git a/patches/api/Add-more-Witch-API.patch b/patches/unapplied/api/Add-more-Witch-API.patch
similarity index 100%
rename from patches/api/Add-more-Witch-API.patch
rename to patches/unapplied/api/Add-more-Witch-API.patch
diff --git a/patches/api/Add-more-Zombie-API.patch b/patches/unapplied/api/Add-more-Zombie-API.patch
similarity index 100%
rename from patches/api/Add-more-Zombie-API.patch
rename to patches/unapplied/api/Add-more-Zombie-API.patch
diff --git a/patches/api/Add-more-line-of-sight-methods.patch b/patches/unapplied/api/Add-more-line-of-sight-methods.patch
similarity index 100%
rename from patches/api/Add-more-line-of-sight-methods.patch
rename to patches/unapplied/api/Add-more-line-of-sight-methods.patch
diff --git a/patches/api/Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/unapplied/api/Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/api/Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/unapplied/api/Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/api/Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/api/Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/api/Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/unapplied/api/Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/api/Add-ray-tracing-methods-to-LivingEntity.patch b/patches/unapplied/api/Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 100%
rename from patches/api/Add-ray-tracing-methods-to-LivingEntity.patch
rename to patches/unapplied/api/Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/patches/api/Add-recipe-to-cook-events.patch b/patches/unapplied/api/Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/api/Add-recipe-to-cook-events.patch
rename to patches/unapplied/api/Add-recipe-to-cook-events.patch
diff --git a/patches/api/Add-sendOpLevel-API.patch b/patches/unapplied/api/Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/api/Add-sendOpLevel-API.patch
rename to patches/unapplied/api/Add-sendOpLevel-API.patch
diff --git a/patches/api/Add-sender-name-to-commands.yml-replacement.patch b/patches/unapplied/api/Add-sender-name-to-commands.yml-replacement.patch
similarity index 100%
rename from patches/api/Add-sender-name-to-commands.yml-replacement.patch
rename to patches/unapplied/api/Add-sender-name-to-commands.yml-replacement.patch
diff --git a/patches/api/Add-setMaxPlayers-API.patch b/patches/unapplied/api/Add-setMaxPlayers-API.patch
similarity index 100%
rename from patches/api/Add-setMaxPlayers-API.patch
rename to patches/unapplied/api/Add-setMaxPlayers-API.patch
diff --git a/patches/api/Add-setPlayerProfile-API-for-Skulls.patch b/patches/unapplied/api/Add-setPlayerProfile-API-for-Skulls.patch
similarity index 100%
rename from patches/api/Add-setPlayerProfile-API-for-Skulls.patch
rename to patches/unapplied/api/Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/api/Add-source-block-constructor-and-getChangedBlockData.patch b/patches/unapplied/api/Add-source-block-constructor-and-getChangedBlockData.patch
similarity index 100%
rename from patches/api/Add-source-block-constructor-and-getChangedBlockData.patch
rename to patches/unapplied/api/Add-source-block-constructor-and-getChangedBlockData.patch
diff --git a/patches/api/Add-source-to-PlayerExpChangeEvent.patch b/patches/unapplied/api/Add-source-to-PlayerExpChangeEvent.patch
similarity index 100%
rename from patches/api/Add-source-to-PlayerExpChangeEvent.patch
rename to patches/unapplied/api/Add-source-to-PlayerExpChangeEvent.patch
diff --git a/patches/api/Add-spectator-target-events.patch b/patches/unapplied/api/Add-spectator-target-events.patch
similarity index 100%
rename from patches/api/Add-spectator-target-events.patch
rename to patches/unapplied/api/Add-spectator-target-events.patch
diff --git a/patches/api/Add-sun-related-API.patch b/patches/unapplied/api/Add-sun-related-API.patch
similarity index 100%
rename from patches/api/Add-sun-related-API.patch
rename to patches/unapplied/api/Add-sun-related-API.patch
diff --git a/patches/api/Add-tick-times-API.patch b/patches/unapplied/api/Add-tick-times-API.patch
similarity index 100%
rename from patches/api/Add-tick-times-API.patch
rename to patches/unapplied/api/Add-tick-times-API.patch
diff --git a/patches/api/Add-view-distance-API.patch b/patches/unapplied/api/Add-view-distance-API.patch
similarity index 100%
rename from patches/api/Add-view-distance-API.patch
rename to patches/unapplied/api/Add-view-distance-API.patch
diff --git a/patches/api/Add-villager-reputation-API.patch b/patches/unapplied/api/Add-villager-reputation-API.patch
similarity index 100%
rename from patches/api/Add-villager-reputation-API.patch
rename to patches/unapplied/api/Add-villager-reputation-API.patch
diff --git a/patches/api/Add-workaround-for-plugins-modifying-the-parent-of-t.patch b/patches/unapplied/api/Add-workaround-for-plugins-modifying-the-parent-of-t.patch
similarity index 100%
rename from patches/api/Add-workaround-for-plugins-modifying-the-parent-of-t.patch
rename to patches/unapplied/api/Add-workaround-for-plugins-modifying-the-parent-of-t.patch
diff --git a/patches/api/Add-worldborder-events.patch b/patches/unapplied/api/Add-worldborder-events.patch
similarity index 100%
rename from patches/api/Add-worldborder-events.patch
rename to patches/unapplied/api/Add-worldborder-events.patch
diff --git a/patches/api/Added-EntityDamageItemEvent.patch b/patches/unapplied/api/Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/api/Added-EntityDamageItemEvent.patch
rename to patches/unapplied/api/Added-EntityDamageItemEvent.patch
diff --git a/patches/api/Added-PlayerBedFailEnterEvent.patch b/patches/unapplied/api/Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/api/Added-PlayerBedFailEnterEvent.patch
rename to patches/unapplied/api/Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/api/Added-PlayerChangeBeaconEffectEvent.patch b/patches/unapplied/api/Added-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/api/Added-PlayerChangeBeaconEffectEvent.patch
rename to patches/unapplied/api/Added-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/api/Added-PlayerDeepSleepEvent.patch b/patches/unapplied/api/Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/api/Added-PlayerDeepSleepEvent.patch
rename to patches/unapplied/api/Added-PlayerDeepSleepEvent.patch
diff --git a/patches/api/Added-PlayerLecternPageChangeEvent.patch b/patches/unapplied/api/Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/api/Added-PlayerLecternPageChangeEvent.patch
rename to patches/unapplied/api/Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/api/Added-PlayerLoomPatternSelectEvent.patch b/patches/unapplied/api/Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/api/Added-PlayerLoomPatternSelectEvent.patch
rename to patches/unapplied/api/Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/api/Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/unapplied/api/Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/api/Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/unapplied/api/Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/api/Added-PlayerTradeEvent.patch b/patches/unapplied/api/Added-PlayerTradeEvent.patch
similarity index 100%
rename from patches/api/Added-PlayerTradeEvent.patch
rename to patches/unapplied/api/Added-PlayerTradeEvent.patch
diff --git a/patches/api/Added-ServerResourcesReloadedEvent.patch b/patches/unapplied/api/Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/api/Added-ServerResourcesReloadedEvent.patch
rename to patches/unapplied/api/Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/api/Added-Vanilla-Entity-Tags.patch b/patches/unapplied/api/Added-Vanilla-Entity-Tags.patch
similarity index 100%
rename from patches/api/Added-Vanilla-Entity-Tags.patch
rename to patches/unapplied/api/Added-Vanilla-Entity-Tags.patch
diff --git a/patches/api/Added-WorldGameRuleChangeEvent.patch b/patches/unapplied/api/Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/api/Added-WorldGameRuleChangeEvent.patch
rename to patches/unapplied/api/Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/api/Additional-Block-Material-API-s.patch b/patches/unapplied/api/Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/api/Additional-Block-Material-API-s.patch
rename to patches/unapplied/api/Additional-Block-Material-API-s.patch
diff --git a/patches/api/Additional-world.getNearbyEntities-API-s.patch b/patches/unapplied/api/Additional-world.getNearbyEntities-API-s.patch
similarity index 100%
rename from patches/api/Additional-world.getNearbyEntities-API-s.patch
rename to patches/unapplied/api/Additional-world.getNearbyEntities-API-s.patch
diff --git a/patches/api/Adds-PlayerArmSwingEvent.patch b/patches/unapplied/api/Adds-PlayerArmSwingEvent.patch
similarity index 100%
rename from patches/api/Adds-PlayerArmSwingEvent.patch
rename to patches/unapplied/api/Adds-PlayerArmSwingEvent.patch
diff --git a/patches/api/Adventure.patch b/patches/unapplied/api/Adventure.patch
similarity index 99%
rename from patches/api/Adventure.patch
rename to patches/unapplied/api/Adventure.patch
index 58eeaae113..792158d693 100644
--- a/patches/api/Adventure.patch
+++ b/patches/unapplied/api/Adventure.patch
@@ -33,7 +33,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ dependencies {
      api("org.yaml:snakeyaml:1.28")
      api("com.googlecode.json-simple:json-simple:1.1.1") // Paper
-     api("it.unimi.dsi:fastutil:8.2.2")
+     api("it.unimi.dsi:fastutil:8.5.6")
 +    apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
 +    apiAndDocs("net.kyori:adventure-api")
 +    apiAndDocs("net.kyori:adventure-text-serializer-gson")
diff --git a/patches/api/Allow-Blocks-to-be-accessed-via-a-long-key.patch b/patches/unapplied/api/Allow-Blocks-to-be-accessed-via-a-long-key.patch
similarity index 100%
rename from patches/api/Allow-Blocks-to-be-accessed-via-a-long-key.patch
rename to patches/unapplied/api/Allow-Blocks-to-be-accessed-via-a-long-key.patch
diff --git a/patches/api/Allow-Reloading-of-Command-Aliases.patch b/patches/unapplied/api/Allow-Reloading-of-Command-Aliases.patch
similarity index 100%
rename from patches/api/Allow-Reloading-of-Command-Aliases.patch
rename to patches/unapplied/api/Allow-Reloading-of-Command-Aliases.patch
diff --git a/patches/api/Allow-adding-items-to-BlockDropItemEvent.patch b/patches/unapplied/api/Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/api/Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/unapplied/api/Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/api/Allow-delegation-to-vanilla-chunk-gen.patch b/patches/unapplied/api/Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/api/Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/unapplied/api/Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/api/Allow-disabling-armour-stand-ticking.patch b/patches/unapplied/api/Allow-disabling-armour-stand-ticking.patch
similarity index 100%
rename from patches/api/Allow-disabling-armour-stand-ticking.patch
rename to patches/unapplied/api/Allow-disabling-armour-stand-ticking.patch
diff --git a/patches/api/Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/unapplied/api/Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
similarity index 100%
rename from patches/api/Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
rename to patches/unapplied/api/Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
diff --git a/patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/unapplied/api/Allow-plugins-to-use-SLF4J-for-logging.patch
similarity index 100%
rename from patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch
rename to patches/unapplied/api/Allow-plugins-to-use-SLF4J-for-logging.patch
diff --git a/patches/api/Allow-setting-the-vex-s-summoner.patch b/patches/unapplied/api/Allow-setting-the-vex-s-summoner.patch
similarity index 100%
rename from patches/api/Allow-setting-the-vex-s-summoner.patch
rename to patches/unapplied/api/Allow-setting-the-vex-s-summoner.patch
diff --git a/patches/api/Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch b/patches/unapplied/api/Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
similarity index 100%
rename from patches/api/Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
rename to patches/unapplied/api/Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
diff --git a/patches/api/Annotation-Test-changes.patch b/patches/unapplied/api/Annotation-Test-changes.patch
similarity index 100%
rename from patches/api/Annotation-Test-changes.patch
rename to patches/unapplied/api/Annotation-Test-changes.patch
diff --git a/patches/api/AnvilDamageEvent.patch b/patches/unapplied/api/AnvilDamageEvent.patch
similarity index 100%
rename from patches/api/AnvilDamageEvent.patch
rename to patches/unapplied/api/AnvilDamageEvent.patch
diff --git a/patches/api/Arrow-pickup-rule-API.patch b/patches/unapplied/api/Arrow-pickup-rule-API.patch
similarity index 100%
rename from patches/api/Arrow-pickup-rule-API.patch
rename to patches/unapplied/api/Arrow-pickup-rule-API.patch
diff --git a/patches/api/Async-Chunks-API.patch b/patches/unapplied/api/Async-Chunks-API.patch
similarity index 100%
rename from patches/api/Async-Chunks-API.patch
rename to patches/unapplied/api/Async-Chunks-API.patch
diff --git a/patches/api/AsyncTabCompleteEvent.patch b/patches/unapplied/api/AsyncTabCompleteEvent.patch
similarity index 100%
rename from patches/api/AsyncTabCompleteEvent.patch
rename to patches/unapplied/api/AsyncTabCompleteEvent.patch
diff --git a/patches/api/Attributes-API-for-item-defaults.patch b/patches/unapplied/api/Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/api/Attributes-API-for-item-defaults.patch
rename to patches/unapplied/api/Attributes-API-for-item-defaults.patch
diff --git a/patches/api/Automatically-disable-plugins-that-fail-to-load.patch b/patches/unapplied/api/Automatically-disable-plugins-that-fail-to-load.patch
similarity index 100%
rename from patches/api/Automatically-disable-plugins-that-fail-to-load.patch
rename to patches/unapplied/api/Automatically-disable-plugins-that-fail-to-load.patch
diff --git a/patches/api/Basic-PlayerProfile-API.patch b/patches/unapplied/api/Basic-PlayerProfile-API.patch
similarity index 100%
rename from patches/api/Basic-PlayerProfile-API.patch
rename to patches/unapplied/api/Basic-PlayerProfile-API.patch
diff --git a/patches/api/Beacon-API-custom-effect-ranges.patch b/patches/unapplied/api/Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/api/Beacon-API-custom-effect-ranges.patch
rename to patches/unapplied/api/Beacon-API-custom-effect-ranges.patch
diff --git a/patches/api/Better-AnnotationTest-printout.patch b/patches/unapplied/api/Better-AnnotationTest-printout.patch
similarity index 100%
rename from patches/api/Better-AnnotationTest-printout.patch
rename to patches/unapplied/api/Better-AnnotationTest-printout.patch
diff --git a/patches/api/BlockDestroyEvent.patch b/patches/unapplied/api/BlockDestroyEvent.patch
similarity index 100%
rename from patches/api/BlockDestroyEvent.patch
rename to patches/unapplied/api/BlockDestroyEvent.patch
diff --git a/patches/api/Brand-support.patch b/patches/unapplied/api/Brand-support.patch
similarity index 100%
rename from patches/api/Brand-support.patch
rename to patches/unapplied/api/Brand-support.patch
diff --git a/patches/api/Cache-the-result-of-Material-isBlock.patch b/patches/unapplied/api/Cache-the-result-of-Material-isBlock.patch
similarity index 100%
rename from patches/api/Cache-the-result-of-Material-isBlock.patch
rename to patches/unapplied/api/Cache-the-result-of-Material-isBlock.patch
diff --git a/patches/api/Change-EnderEye-target-without-changing-other-things.patch b/patches/unapplied/api/Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/api/Change-EnderEye-target-without-changing-other-things.patch
rename to patches/unapplied/api/Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/api/Change-the-reserved-channel-check-to-be-sensible.patch b/patches/unapplied/api/Change-the-reserved-channel-check-to-be-sensible.patch
similarity index 100%
rename from patches/api/Change-the-reserved-channel-check-to-be-sensible.patch
rename to patches/unapplied/api/Change-the-reserved-channel-check-to-be-sensible.patch
diff --git a/patches/api/Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch b/patches/unapplied/api/Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
similarity index 100%
rename from patches/api/Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
rename to patches/unapplied/api/Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
diff --git a/patches/api/Close-Plugin-Class-Loaders-on-Disable.patch b/patches/unapplied/api/Close-Plugin-Class-Loaders-on-Disable.patch
similarity index 100%
rename from patches/api/Close-Plugin-Class-Loaders-on-Disable.patch
rename to patches/unapplied/api/Close-Plugin-Class-Loaders-on-Disable.patch
diff --git a/patches/api/Complete-resource-pack-API.patch b/patches/unapplied/api/Complete-resource-pack-API.patch
similarity index 100%
rename from patches/api/Complete-resource-pack-API.patch
rename to patches/unapplied/api/Complete-resource-pack-API.patch
diff --git a/patches/api/Create-HoverEvent-from-ItemStack-Entity.patch b/patches/unapplied/api/Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/api/Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/unapplied/api/Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/api/Custom-replacement-for-eaten-items.patch b/patches/unapplied/api/Custom-replacement-for-eaten-items.patch
similarity index 100%
rename from patches/api/Custom-replacement-for-eaten-items.patch
rename to patches/unapplied/api/Custom-replacement-for-eaten-items.patch
diff --git a/patches/api/Disable-Sync-Events-firing-Async-errors-during-shutd.patch b/patches/unapplied/api/Disable-Sync-Events-firing-Async-errors-during-shutd.patch
similarity index 100%
rename from patches/api/Disable-Sync-Events-firing-Async-errors-during-shutd.patch
rename to patches/unapplied/api/Disable-Sync-Events-firing-Async-errors-during-shutd.patch
diff --git a/patches/api/Display-warning-on-deprecated-recipe-API.patch b/patches/unapplied/api/Display-warning-on-deprecated-recipe-API.patch
similarity index 100%
rename from patches/api/Display-warning-on-deprecated-recipe-API.patch
rename to patches/unapplied/api/Display-warning-on-deprecated-recipe-API.patch
diff --git a/patches/api/Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch b/patches/unapplied/api/Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
similarity index 100%
rename from patches/api/Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
rename to patches/unapplied/api/Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
diff --git a/patches/api/Enable-multi-release-plugin-jars.patch b/patches/unapplied/api/Enable-multi-release-plugin-jars.patch
similarity index 100%
rename from patches/api/Enable-multi-release-plugin-jars.patch
rename to patches/unapplied/api/Enable-multi-release-plugin-jars.patch
diff --git a/patches/api/EnderDragon-Events.patch b/patches/unapplied/api/EnderDragon-Events.patch
similarity index 100%
rename from patches/api/EnderDragon-Events.patch
rename to patches/unapplied/api/EnderDragon-Events.patch
diff --git a/patches/api/Enderman.teleportRandomly.patch b/patches/unapplied/api/Enderman.teleportRandomly.patch
similarity index 100%
rename from patches/api/Enderman.teleportRandomly.patch
rename to patches/unapplied/api/Enderman.teleportRandomly.patch
diff --git a/patches/api/EndermanAttackPlayerEvent.patch b/patches/unapplied/api/EndermanAttackPlayerEvent.patch
similarity index 100%
rename from patches/api/EndermanAttackPlayerEvent.patch
rename to patches/unapplied/api/EndermanAttackPlayerEvent.patch
diff --git a/patches/api/EndermanEscapeEvent.patch b/patches/unapplied/api/EndermanEscapeEvent.patch
similarity index 100%
rename from patches/api/EndermanEscapeEvent.patch
rename to patches/unapplied/api/EndermanEscapeEvent.patch
diff --git a/patches/api/Entity-AddTo-RemoveFrom-World-Events.patch b/patches/unapplied/api/Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 100%
rename from patches/api/Entity-AddTo-RemoveFrom-World-Events.patch
rename to patches/unapplied/api/Entity-AddTo-RemoveFrom-World-Events.patch
diff --git a/patches/api/Entity-Jump-API.patch b/patches/unapplied/api/Entity-Jump-API.patch
similarity index 100%
rename from patches/api/Entity-Jump-API.patch
rename to patches/unapplied/api/Entity-Jump-API.patch
diff --git a/patches/api/Entity-Origin-API.patch b/patches/unapplied/api/Entity-Origin-API.patch
similarity index 100%
rename from patches/api/Entity-Origin-API.patch
rename to patches/unapplied/api/Entity-Origin-API.patch
diff --git a/patches/api/Entity-fromMobSpawner.patch b/patches/unapplied/api/Entity-fromMobSpawner.patch
similarity index 100%
rename from patches/api/Entity-fromMobSpawner.patch
rename to patches/unapplied/api/Entity-fromMobSpawner.patch
diff --git a/patches/api/Entity-getChunk-API.patch b/patches/unapplied/api/Entity-getChunk-API.patch
similarity index 100%
rename from patches/api/Entity-getChunk-API.patch
rename to patches/unapplied/api/Entity-getChunk-API.patch
diff --git a/patches/api/Entity-getEntitySpawnReason.patch b/patches/unapplied/api/Entity-getEntitySpawnReason.patch
similarity index 100%
rename from patches/api/Entity-getEntitySpawnReason.patch
rename to patches/unapplied/api/Entity-getEntitySpawnReason.patch
diff --git a/patches/api/Entity-isTicking.patch b/patches/unapplied/api/Entity-isTicking.patch
similarity index 100%
rename from patches/api/Entity-isTicking.patch
rename to patches/unapplied/api/Entity-isTicking.patch
diff --git a/patches/api/EntityMoveEvent.patch b/patches/unapplied/api/EntityMoveEvent.patch
similarity index 100%
rename from patches/api/EntityMoveEvent.patch
rename to patches/unapplied/api/EntityMoveEvent.patch
diff --git a/patches/api/EntityPathfindEvent.patch b/patches/unapplied/api/EntityPathfindEvent.patch
similarity index 100%
rename from patches/api/EntityPathfindEvent.patch
rename to patches/unapplied/api/EntityPathfindEvent.patch
diff --git a/patches/api/EntityRegainHealthEvent-isFastRegen-API.patch b/patches/unapplied/api/EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 100%
rename from patches/api/EntityRegainHealthEvent-isFastRegen-API.patch
rename to patches/unapplied/api/EntityRegainHealthEvent-isFastRegen-API.patch
diff --git a/patches/api/EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/patches/unapplied/api/EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
similarity index 100%
rename from patches/api/EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
rename to patches/unapplied/api/EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
diff --git a/patches/api/EntityTransformedEvent.patch b/patches/unapplied/api/EntityTransformedEvent.patch
similarity index 100%
rename from patches/api/EntityTransformedEvent.patch
rename to patches/unapplied/api/EntityTransformedEvent.patch
diff --git a/patches/api/Expand-ArmorStand-API.patch b/patches/unapplied/api/Expand-ArmorStand-API.patch
similarity index 100%
rename from patches/api/Expand-ArmorStand-API.patch
rename to patches/unapplied/api/Expand-ArmorStand-API.patch
diff --git a/patches/api/Expand-Explosions-API.patch b/patches/unapplied/api/Expand-Explosions-API.patch
similarity index 100%
rename from patches/api/Expand-Explosions-API.patch
rename to patches/unapplied/api/Expand-Explosions-API.patch
diff --git a/patches/api/Expand-Location-Manipulation-API.patch b/patches/unapplied/api/Expand-Location-Manipulation-API.patch
similarity index 100%
rename from patches/api/Expand-Location-Manipulation-API.patch
rename to patches/unapplied/api/Expand-Location-Manipulation-API.patch
diff --git a/patches/api/Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/unapplied/api/Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 100%
rename from patches/api/Expand-World.spawnParticle-API-and-add-Builder.patch
rename to patches/unapplied/api/Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/patches/api/ExperienceOrbMergeEvent.patch b/patches/unapplied/api/ExperienceOrbMergeEvent.patch
similarity index 100%
rename from patches/api/ExperienceOrbMergeEvent.patch
rename to patches/unapplied/api/ExperienceOrbMergeEvent.patch
diff --git a/patches/api/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/unapplied/api/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 100%
rename from patches/api/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to patches/unapplied/api/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
diff --git a/patches/api/Expose-Arrow-getItemStack.patch b/patches/unapplied/api/Expose-Arrow-getItemStack.patch
similarity index 100%
rename from patches/api/Expose-Arrow-getItemStack.patch
rename to patches/unapplied/api/Expose-Arrow-getItemStack.patch
diff --git a/patches/api/Expose-LivingEntity-hurt-direction.patch b/patches/unapplied/api/Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/api/Expose-LivingEntity-hurt-direction.patch
rename to patches/unapplied/api/Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/api/Expose-MinecraftServer-isRunning.patch b/patches/unapplied/api/Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from patches/api/Expose-MinecraftServer-isRunning.patch
rename to patches/unapplied/api/Expose-MinecraftServer-isRunning.patch
diff --git a/patches/api/Expose-Tracked-Players.patch b/patches/unapplied/api/Expose-Tracked-Players.patch
similarity index 100%
rename from patches/api/Expose-Tracked-Players.patch
rename to patches/unapplied/api/Expose-Tracked-Players.patch
diff --git a/patches/api/Expose-WorldBorder-isInBounds-Location-check.patch b/patches/unapplied/api/Expose-WorldBorder-isInBounds-Location-check.patch
similarity index 100%
rename from patches/api/Expose-WorldBorder-isInBounds-Location-check.patch
rename to patches/unapplied/api/Expose-WorldBorder-isInBounds-Location-check.patch
diff --git a/patches/api/Expose-attack-cooldown-methods-for-Player.patch b/patches/unapplied/api/Expose-attack-cooldown-methods-for-Player.patch
similarity index 100%
rename from patches/api/Expose-attack-cooldown-methods-for-Player.patch
rename to patches/unapplied/api/Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/api/Expose-client-protocol-version-and-virtual-host.patch b/patches/unapplied/api/Expose-client-protocol-version-and-virtual-host.patch
similarity index 100%
rename from patches/api/Expose-client-protocol-version-and-virtual-host.patch
rename to patches/unapplied/api/Expose-client-protocol-version-and-virtual-host.patch
diff --git a/patches/api/Expose-game-version.patch b/patches/unapplied/api/Expose-game-version.patch
similarity index 100%
rename from patches/api/Expose-game-version.patch
rename to patches/unapplied/api/Expose-game-version.patch
diff --git a/patches/api/Expose-protocol-version.patch b/patches/unapplied/api/Expose-protocol-version.patch
similarity index 100%
rename from patches/api/Expose-protocol-version.patch
rename to patches/unapplied/api/Expose-protocol-version.patch
diff --git a/patches/api/Expose-server-CommandMap.patch b/patches/unapplied/api/Expose-server-CommandMap.patch
similarity index 100%
rename from patches/api/Expose-server-CommandMap.patch
rename to patches/unapplied/api/Expose-server-CommandMap.patch
diff --git a/patches/api/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/unapplied/api/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/api/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/unapplied/api/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/api/Expose-the-internal-current-tick.patch b/patches/unapplied/api/Expose-the-internal-current-tick.patch
similarity index 100%
rename from patches/api/Expose-the-internal-current-tick.patch
rename to patches/unapplied/api/Expose-the-internal-current-tick.patch
diff --git a/patches/api/Fill-Profile-Property-Events.patch b/patches/unapplied/api/Fill-Profile-Property-Events.patch
similarity index 100%
rename from patches/api/Fill-Profile-Property-Events.patch
rename to patches/unapplied/api/Fill-Profile-Property-Events.patch
diff --git a/patches/api/Fireworks-API-s.patch b/patches/unapplied/api/Fireworks-API-s.patch
similarity index 100%
rename from patches/api/Fireworks-API-s.patch
rename to patches/unapplied/api/Fireworks-API-s.patch
diff --git a/patches/api/Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch b/patches/unapplied/api/Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
similarity index 100%
rename from patches/api/Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
rename to patches/unapplied/api/Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
diff --git a/patches/api/Fix-ServerListPingEvent-flagging-as-Async.patch b/patches/unapplied/api/Fix-ServerListPingEvent-flagging-as-Async.patch
similarity index 100%
rename from patches/api/Fix-ServerListPingEvent-flagging-as-Async.patch
rename to patches/unapplied/api/Fix-ServerListPingEvent-flagging-as-Async.patch
diff --git a/patches/api/Fix-Spigot-annotation-mistakes.patch b/patches/unapplied/api/Fix-Spigot-annotation-mistakes.patch
similarity index 100%
rename from patches/api/Fix-Spigot-annotation-mistakes.patch
rename to patches/unapplied/api/Fix-Spigot-annotation-mistakes.patch
diff --git a/patches/api/Fix-issues-with-mob-conversion.patch b/patches/unapplied/api/Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/api/Fix-issues-with-mob-conversion.patch
rename to patches/unapplied/api/Fix-issues-with-mob-conversion.patch
diff --git a/patches/api/Fix-plugin-provides-load-order.patch b/patches/unapplied/api/Fix-plugin-provides-load-order.patch
similarity index 100%
rename from patches/api/Fix-plugin-provides-load-order.patch
rename to patches/unapplied/api/Fix-plugin-provides-load-order.patch
diff --git a/patches/api/Fix-upstream-javadocs.patch b/patches/unapplied/api/Fix-upstream-javadocs.patch
similarity index 100%
rename from patches/api/Fix-upstream-javadocs.patch
rename to patches/unapplied/api/Fix-upstream-javadocs.patch
diff --git a/patches/api/Get-entity-default-attributes.patch b/patches/unapplied/api/Get-entity-default-attributes.patch
similarity index 100%
rename from patches/api/Get-entity-default-attributes.patch
rename to patches/unapplied/api/Get-entity-default-attributes.patch
diff --git a/patches/api/Goat-ram-API.patch b/patches/unapplied/api/Goat-ram-API.patch
similarity index 100%
rename from patches/api/Goat-ram-API.patch
rename to patches/unapplied/api/Goat-ram-API.patch
diff --git a/patches/api/Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/patches/unapplied/api/Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
similarity index 100%
rename from patches/api/Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
rename to patches/unapplied/api/Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
diff --git a/patches/api/Handle-plugin-prefixes-in-implementation-logging-con.patch b/patches/unapplied/api/Handle-plugin-prefixes-in-implementation-logging-con.patch
similarity index 100%
rename from patches/api/Handle-plugin-prefixes-in-implementation-logging-con.patch
rename to patches/unapplied/api/Handle-plugin-prefixes-in-implementation-logging-con.patch
diff --git a/patches/api/Here-s-Johnny.patch b/patches/unapplied/api/Here-s-Johnny.patch
similarity index 100%
rename from patches/api/Here-s-Johnny.patch
rename to patches/unapplied/api/Here-s-Johnny.patch
diff --git a/patches/api/Ignore-package-private-methods-for-nullability-annot.patch b/patches/unapplied/api/Ignore-package-private-methods-for-nullability-annot.patch
similarity index 100%
rename from patches/api/Ignore-package-private-methods-for-nullability-annot.patch
rename to patches/unapplied/api/Ignore-package-private-methods-for-nullability-annot.patch
diff --git a/patches/api/IllegalPacketEvent.patch b/patches/unapplied/api/IllegalPacketEvent.patch
similarity index 100%
rename from patches/api/IllegalPacketEvent.patch
rename to patches/unapplied/api/IllegalPacketEvent.patch
diff --git a/patches/api/Implement-Keyed-on-World.patch b/patches/unapplied/api/Implement-Keyed-on-World.patch
similarity index 100%
rename from patches/api/Implement-Keyed-on-World.patch
rename to patches/unapplied/api/Implement-Keyed-on-World.patch
diff --git a/patches/api/Implement-furnace-cook-speed-multiplier-API.patch b/patches/unapplied/api/Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from patches/api/Implement-furnace-cook-speed-multiplier-API.patch
rename to patches/unapplied/api/Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/api/Improve-death-events.patch b/patches/unapplied/api/Improve-death-events.patch
similarity index 100%
rename from patches/api/Improve-death-events.patch
rename to patches/unapplied/api/Improve-death-events.patch
diff --git a/patches/api/Improve-the-Saddle-API-for-Horses.patch b/patches/unapplied/api/Improve-the-Saddle-API-for-Horses.patch
similarity index 100%
rename from patches/api/Improve-the-Saddle-API-for-Horses.patch
rename to patches/unapplied/api/Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/api/Increase-custom-payload-channel-message-size.patch b/patches/unapplied/api/Increase-custom-payload-channel-message-size.patch
similarity index 100%
rename from patches/api/Increase-custom-payload-channel-message-size.patch
rename to patches/unapplied/api/Increase-custom-payload-channel-message-size.patch
diff --git a/patches/api/Introduce-beacon-activation-deactivation-events.patch b/patches/unapplied/api/Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/api/Introduce-beacon-activation-deactivation-events.patch
rename to patches/unapplied/api/Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/api/Inventory-close.patch b/patches/unapplied/api/Inventory-close.patch
similarity index 100%
rename from patches/api/Inventory-close.patch
rename to patches/unapplied/api/Inventory-close.patch
diff --git a/patches/api/Inventory-getHolder-method-without-block-snapshot.patch b/patches/unapplied/api/Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/api/Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/unapplied/api/Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/api/Inventory-removeItemAnySlot.patch b/patches/unapplied/api/Inventory-removeItemAnySlot.patch
similarity index 100%
rename from patches/api/Inventory-removeItemAnySlot.patch
rename to patches/unapplied/api/Inventory-removeItemAnySlot.patch
diff --git a/patches/api/InventoryCloseEvent-Reason-API.patch b/patches/unapplied/api/InventoryCloseEvent-Reason-API.patch
similarity index 100%
rename from patches/api/InventoryCloseEvent-Reason-API.patch
rename to patches/unapplied/api/InventoryCloseEvent-Reason-API.patch
diff --git a/patches/api/Item-Rarity-API.patch b/patches/unapplied/api/Item-Rarity-API.patch
similarity index 100%
rename from patches/api/Item-Rarity-API.patch
rename to patches/unapplied/api/Item-Rarity-API.patch
diff --git a/patches/api/Item-canEntityPickup.patch b/patches/unapplied/api/Item-canEntityPickup.patch
similarity index 100%
rename from patches/api/Item-canEntityPickup.patch
rename to patches/unapplied/api/Item-canEntityPickup.patch
diff --git a/patches/api/Item-no-age-no-player-pickup.patch b/patches/unapplied/api/Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/api/Item-no-age-no-player-pickup.patch
rename to patches/unapplied/api/Item-no-age-no-player-pickup.patch
diff --git a/patches/api/ItemStack-API-additions-for-quantity-flags-lore.patch b/patches/unapplied/api/ItemStack-API-additions-for-quantity-flags-lore.patch
similarity index 100%
rename from patches/api/ItemStack-API-additions-for-quantity-flags-lore.patch
rename to patches/unapplied/api/ItemStack-API-additions-for-quantity-flags-lore.patch
diff --git a/patches/api/ItemStack-editMeta.patch b/patches/unapplied/api/ItemStack-editMeta.patch
similarity index 100%
rename from patches/api/ItemStack-editMeta.patch
rename to patches/unapplied/api/ItemStack-editMeta.patch
diff --git a/patches/api/ItemStack-getMaxItemUseDuration.patch b/patches/unapplied/api/ItemStack-getMaxItemUseDuration.patch
similarity index 100%
rename from patches/api/ItemStack-getMaxItemUseDuration.patch
rename to patches/unapplied/api/ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/api/ItemStack-repair-check-API.patch b/patches/unapplied/api/ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/api/ItemStack-repair-check-API.patch
rename to patches/unapplied/api/ItemStack-repair-check-API.patch
diff --git a/patches/api/Left-handed-API.patch b/patches/unapplied/api/Left-handed-API.patch
similarity index 100%
rename from patches/api/Left-handed-API.patch
rename to patches/unapplied/api/Left-handed-API.patch
diff --git a/patches/api/List-all-missing-hard-depends-not-just-first.patch b/patches/unapplied/api/List-all-missing-hard-depends-not-just-first.patch
similarity index 100%
rename from patches/api/List-all-missing-hard-depends-not-just-first.patch
rename to patches/unapplied/api/List-all-missing-hard-depends-not-just-first.patch
diff --git a/patches/api/LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/unapplied/api/LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 100%
rename from patches/api/LivingEntity-Hand-Raised-Item-Use-API.patch
rename to patches/unapplied/api/LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/patches/api/LivingEntity-setKiller.patch b/patches/unapplied/api/LivingEntity-setKiller.patch
similarity index 100%
rename from patches/api/LivingEntity-setKiller.patch
rename to patches/unapplied/api/LivingEntity-setKiller.patch
diff --git a/patches/api/Location.isChunkLoaded-API.patch b/patches/unapplied/api/Location.isChunkLoaded-API.patch
similarity index 100%
rename from patches/api/Location.isChunkLoaded-API.patch
rename to patches/unapplied/api/Location.isChunkLoaded-API.patch
diff --git a/patches/api/Location.toBlockLocation-toCenterLocation.patch b/patches/unapplied/api/Location.toBlockLocation-toCenterLocation.patch
similarity index 100%
rename from patches/api/Location.toBlockLocation-toCenterLocation.patch
rename to patches/unapplied/api/Location.toBlockLocation-toCenterLocation.patch
diff --git a/patches/api/LootTable-API.patch b/patches/unapplied/api/LootTable-API.patch
similarity index 100%
rename from patches/api/LootTable-API.patch
rename to patches/unapplied/api/LootTable-API.patch
diff --git a/patches/api/Make-EnderDragon-extend-Mob.patch b/patches/unapplied/api/Make-EnderDragon-extend-Mob.patch
similarity index 100%
rename from patches/api/Make-EnderDragon-extend-Mob.patch
rename to patches/unapplied/api/Make-EnderDragon-extend-Mob.patch
diff --git a/patches/api/Make-EntityUnleashEvent-cancellable.patch b/patches/unapplied/api/Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/api/Make-EntityUnleashEvent-cancellable.patch
rename to patches/unapplied/api/Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/api/Make-JavaPluginLoader-thread-safe.patch b/patches/unapplied/api/Make-JavaPluginLoader-thread-safe.patch
similarity index 100%
rename from patches/api/Make-JavaPluginLoader-thread-safe.patch
rename to patches/unapplied/api/Make-JavaPluginLoader-thread-safe.patch
diff --git a/patches/api/Make-plugins-list-alphabetical.patch b/patches/unapplied/api/Make-plugins-list-alphabetical.patch
similarity index 100%
rename from patches/api/Make-plugins-list-alphabetical.patch
rename to patches/unapplied/api/Make-plugins-list-alphabetical.patch
diff --git a/patches/api/Make-shield-blocking-delay-configurable.patch b/patches/unapplied/api/Make-shield-blocking-delay-configurable.patch
similarity index 100%
rename from patches/api/Make-shield-blocking-delay-configurable.patch
rename to patches/unapplied/api/Make-shield-blocking-delay-configurable.patch
diff --git a/patches/api/Make-the-default-permission-message-configurable.patch b/patches/unapplied/api/Make-the-default-permission-message-configurable.patch
similarity index 100%
rename from patches/api/Make-the-default-permission-message-configurable.patch
rename to patches/unapplied/api/Make-the-default-permission-message-configurable.patch
diff --git a/patches/api/Material-API-additions.patch b/patches/unapplied/api/Material-API-additions.patch
similarity index 100%
rename from patches/api/Material-API-additions.patch
rename to patches/unapplied/api/Material-API-additions.patch
diff --git a/patches/api/Misc-Utils.patch b/patches/unapplied/api/Misc-Utils.patch
similarity index 100%
rename from patches/api/Misc-Utils.patch
rename to patches/unapplied/api/Misc-Utils.patch
diff --git a/patches/api/Missing-Entity-Behavior-API.patch b/patches/unapplied/api/Missing-Entity-Behavior-API.patch
similarity index 100%
rename from patches/api/Missing-Entity-Behavior-API.patch
rename to patches/unapplied/api/Missing-Entity-Behavior-API.patch
diff --git a/patches/api/Mob-Pathfinding-API.patch b/patches/unapplied/api/Mob-Pathfinding-API.patch
similarity index 100%
rename from patches/api/Mob-Pathfinding-API.patch
rename to patches/unapplied/api/Mob-Pathfinding-API.patch
diff --git a/patches/api/Mob-Spawner-API-Enhancements.patch b/patches/unapplied/api/Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from patches/api/Mob-Spawner-API-Enhancements.patch
rename to patches/unapplied/api/Mob-Spawner-API-Enhancements.patch
diff --git a/patches/api/More-CommandBlock-API.patch b/patches/unapplied/api/More-CommandBlock-API.patch
similarity index 100%
rename from patches/api/More-CommandBlock-API.patch
rename to patches/unapplied/api/More-CommandBlock-API.patch
diff --git a/patches/api/More-Enchantment-API.patch b/patches/unapplied/api/More-Enchantment-API.patch
similarity index 100%
rename from patches/api/More-Enchantment-API.patch
rename to patches/unapplied/api/More-Enchantment-API.patch
diff --git a/patches/api/More-Lidded-Block-API.patch b/patches/unapplied/api/More-Lidded-Block-API.patch
similarity index 100%
rename from patches/api/More-Lidded-Block-API.patch
rename to patches/unapplied/api/More-Lidded-Block-API.patch
diff --git a/patches/api/More-World-API.patch b/patches/unapplied/api/More-World-API.patch
similarity index 100%
rename from patches/api/More-World-API.patch
rename to patches/unapplied/api/More-World-API.patch
diff --git a/patches/api/More-lightning-API.patch b/patches/unapplied/api/More-lightning-API.patch
similarity index 100%
rename from patches/api/More-lightning-API.patch
rename to patches/unapplied/api/More-lightning-API.patch
diff --git a/patches/api/Optimize-Hoppers.patch b/patches/unapplied/api/Optimize-Hoppers.patch
similarity index 100%
rename from patches/api/Optimize-Hoppers.patch
rename to patches/unapplied/api/Optimize-Hoppers.patch
diff --git a/patches/api/Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/unapplied/api/Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/api/Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/unapplied/api/Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/api/Performance-Concurrency-Improvements-to-Permissions.patch b/patches/unapplied/api/Performance-Concurrency-Improvements-to-Permissions.patch
similarity index 100%
rename from patches/api/Performance-Concurrency-Improvements-to-Permissions.patch
rename to patches/unapplied/api/Performance-Concurrency-Improvements-to-Permissions.patch
diff --git a/patches/api/Player-Chunk-Load-Unload-Events.patch b/patches/unapplied/api/Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/api/Player-Chunk-Load-Unload-Events.patch
rename to patches/unapplied/api/Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/api/Player-Tab-List-and-Title-APIs.patch b/patches/unapplied/api/Player-Tab-List-and-Title-APIs.patch
similarity index 100%
rename from patches/api/Player-Tab-List-and-Title-APIs.patch
rename to patches/unapplied/api/Player-Tab-List-and-Title-APIs.patch
diff --git a/patches/api/Player-affects-spawning-API.patch b/patches/unapplied/api/Player-affects-spawning-API.patch
similarity index 100%
rename from patches/api/Player-affects-spawning-API.patch
rename to patches/unapplied/api/Player-affects-spawning-API.patch
diff --git a/patches/api/Player-elytra-boost-API.patch b/patches/unapplied/api/Player-elytra-boost-API.patch
similarity index 100%
rename from patches/api/Player-elytra-boost-API.patch
rename to patches/unapplied/api/Player-elytra-boost-API.patch
diff --git a/patches/api/Player.setPlayerProfile-API.patch b/patches/unapplied/api/Player.setPlayerProfile-API.patch
similarity index 100%
rename from patches/api/Player.setPlayerProfile-API.patch
rename to patches/unapplied/api/Player.setPlayerProfile-API.patch
diff --git a/patches/api/PlayerAdvancementCriterionGrantEvent.patch b/patches/unapplied/api/PlayerAdvancementCriterionGrantEvent.patch
similarity index 100%
rename from patches/api/PlayerAdvancementCriterionGrantEvent.patch
rename to patches/unapplied/api/PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/api/PlayerAttemptPickupItemEvent.patch b/patches/unapplied/api/PlayerAttemptPickupItemEvent.patch
similarity index 100%
rename from patches/api/PlayerAttemptPickupItemEvent.patch
rename to patches/unapplied/api/PlayerAttemptPickupItemEvent.patch
diff --git a/patches/api/PlayerDeathEvent-getItemsToKeep.patch b/patches/unapplied/api/PlayerDeathEvent-getItemsToKeep.patch
similarity index 100%
rename from patches/api/PlayerDeathEvent-getItemsToKeep.patch
rename to patches/unapplied/api/PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/api/PlayerDeathEvent-shouldDropExperience.patch b/patches/unapplied/api/PlayerDeathEvent-shouldDropExperience.patch
similarity index 100%
rename from patches/api/PlayerDeathEvent-shouldDropExperience.patch
rename to patches/unapplied/api/PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/api/PlayerElytraBoostEvent.patch b/patches/unapplied/api/PlayerElytraBoostEvent.patch
similarity index 100%
rename from patches/api/PlayerElytraBoostEvent.patch
rename to patches/unapplied/api/PlayerElytraBoostEvent.patch
diff --git a/patches/api/PlayerLaunchProjectileEvent.patch b/patches/unapplied/api/PlayerLaunchProjectileEvent.patch
similarity index 100%
rename from patches/api/PlayerLaunchProjectileEvent.patch
rename to patches/unapplied/api/PlayerLaunchProjectileEvent.patch
diff --git a/patches/api/PlayerMoveEvent-Improvements.patch b/patches/unapplied/api/PlayerMoveEvent-Improvements.patch
similarity index 100%
rename from patches/api/PlayerMoveEvent-Improvements.patch
rename to patches/unapplied/api/PlayerMoveEvent-Improvements.patch
diff --git a/patches/api/PlayerNaturallySpawnCreaturesEvent.patch b/patches/unapplied/api/PlayerNaturallySpawnCreaturesEvent.patch
similarity index 100%
rename from patches/api/PlayerNaturallySpawnCreaturesEvent.patch
rename to patches/unapplied/api/PlayerNaturallySpawnCreaturesEvent.patch
diff --git a/patches/api/PlayerPickupExperienceEvent.patch b/patches/unapplied/api/PlayerPickupExperienceEvent.patch
similarity index 100%
rename from patches/api/PlayerPickupExperienceEvent.patch
rename to patches/unapplied/api/PlayerPickupExperienceEvent.patch
diff --git a/patches/api/PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/unapplied/api/PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 100%
rename from patches/api/PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to patches/unapplied/api/PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/patches/api/PlayerReadyArrowEvent.patch b/patches/unapplied/api/PlayerReadyArrowEvent.patch
similarity index 100%
rename from patches/api/PlayerReadyArrowEvent.patch
rename to patches/unapplied/api/PlayerReadyArrowEvent.patch
diff --git a/patches/api/PlayerTeleportEndGatewayEvent.patch b/patches/unapplied/api/PlayerTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/api/PlayerTeleportEndGatewayEvent.patch
rename to patches/unapplied/api/PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/api/Potential-bed-API.patch b/patches/unapplied/api/Potential-bed-API.patch
similarity index 100%
rename from patches/api/Potential-bed-API.patch
rename to patches/unapplied/api/Potential-bed-API.patch
diff --git a/patches/api/PotionEffect-clone-methods.patch b/patches/unapplied/api/PotionEffect-clone-methods.patch
similarity index 100%
rename from patches/api/PotionEffect-clone-methods.patch
rename to patches/unapplied/api/PotionEffect-clone-methods.patch
diff --git a/patches/api/PreCreatureSpawnEvent.patch b/patches/unapplied/api/PreCreatureSpawnEvent.patch
similarity index 100%
rename from patches/api/PreCreatureSpawnEvent.patch
rename to patches/unapplied/api/PreCreatureSpawnEvent.patch
diff --git a/patches/api/PreSpawnerSpawnEvent.patch b/patches/unapplied/api/PreSpawnerSpawnEvent.patch
similarity index 100%
rename from patches/api/PreSpawnerSpawnEvent.patch
rename to patches/unapplied/api/PreSpawnerSpawnEvent.patch
diff --git a/patches/api/Prioritise-own-classes-where-possible.patch b/patches/unapplied/api/Prioritise-own-classes-where-possible.patch
similarity index 100%
rename from patches/api/Prioritise-own-classes-where-possible.patch
rename to patches/unapplied/api/Prioritise-own-classes-where-possible.patch
diff --git a/patches/api/Profile-Lookup-Events.patch b/patches/unapplied/api/Profile-Lookup-Events.patch
similarity index 100%
rename from patches/api/Profile-Lookup-Events.patch
rename to patches/unapplied/api/Profile-Lookup-Events.patch
diff --git a/patches/api/ProfileWhitelistVerifyEvent.patch b/patches/unapplied/api/ProfileWhitelistVerifyEvent.patch
similarity index 100%
rename from patches/api/ProfileWhitelistVerifyEvent.patch
rename to patches/unapplied/api/ProfileWhitelistVerifyEvent.patch
diff --git a/patches/api/Provide-Chunk-Coordinates-as-a-Long-API.patch b/patches/unapplied/api/Provide-Chunk-Coordinates-as-a-Long-API.patch
similarity index 100%
rename from patches/api/Provide-Chunk-Coordinates-as-a-Long-API.patch
rename to patches/unapplied/api/Provide-Chunk-Coordinates-as-a-Long-API.patch
diff --git a/patches/api/Provide-E-TE-Chunk-count-stat-methods.patch b/patches/unapplied/api/Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 100%
rename from patches/api/Provide-E-TE-Chunk-count-stat-methods.patch
rename to patches/unapplied/api/Provide-E-TE-Chunk-count-stat-methods.patch
diff --git a/patches/api/Provide-a-useful-PluginClassLoader-toString.patch b/patches/unapplied/api/Provide-a-useful-PluginClassLoader-toString.patch
similarity index 100%
rename from patches/api/Provide-a-useful-PluginClassLoader-toString.patch
rename to patches/unapplied/api/Provide-a-useful-PluginClassLoader-toString.patch
diff --git a/patches/api/RangedEntity-API.patch b/patches/unapplied/api/RangedEntity-API.patch
similarity index 100%
rename from patches/api/RangedEntity-API.patch
rename to patches/unapplied/api/RangedEntity-API.patch
diff --git a/patches/api/Reduce-thread-synchronization-in-MetadataStoreBase.patch b/patches/unapplied/api/Reduce-thread-synchronization-in-MetadataStoreBase.patch
similarity index 100%
rename from patches/api/Reduce-thread-synchronization-in-MetadataStoreBase.patch
rename to patches/unapplied/api/Reduce-thread-synchronization-in-MetadataStoreBase.patch
diff --git a/patches/api/Remove-deadlock-risk-in-firing-async-events.patch b/patches/unapplied/api/Remove-deadlock-risk-in-firing-async-events.patch
similarity index 100%
rename from patches/api/Remove-deadlock-risk-in-firing-async-events.patch
rename to patches/unapplied/api/Remove-deadlock-risk-in-firing-async-events.patch
diff --git a/patches/api/Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/unapplied/api/Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/api/Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/unapplied/api/Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/api/Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/unapplied/api/Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/api/Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/unapplied/api/Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/api/Server-Tick-Events.patch b/patches/unapplied/api/Server-Tick-Events.patch
similarity index 100%
rename from patches/api/Server-Tick-Events.patch
rename to patches/unapplied/api/Server-Tick-Events.patch
diff --git a/patches/api/Shoulder-Entities-Release-API.patch b/patches/unapplied/api/Shoulder-Entities-Release-API.patch
similarity index 100%
rename from patches/api/Shoulder-Entities-Release-API.patch
rename to patches/unapplied/api/Shoulder-Entities-Release-API.patch
diff --git a/patches/api/SkeletonHorse-Additions.patch b/patches/unapplied/api/SkeletonHorse-Additions.patch
similarity index 100%
rename from patches/api/SkeletonHorse-Additions.patch
rename to patches/unapplied/api/SkeletonHorse-Additions.patch
diff --git a/patches/api/Slime-Pathfinder-Events.patch b/patches/unapplied/api/Slime-Pathfinder-Events.patch
similarity index 100%
rename from patches/api/Slime-Pathfinder-Events.patch
rename to patches/unapplied/api/Slime-Pathfinder-Events.patch
diff --git a/patches/api/Spawn-Reason-API.patch b/patches/unapplied/api/Spawn-Reason-API.patch
similarity index 100%
rename from patches/api/Spawn-Reason-API.patch
rename to patches/unapplied/api/Spawn-Reason-API.patch
diff --git a/patches/api/Stinger-API.patch b/patches/unapplied/api/Stinger-API.patch
similarity index 100%
rename from patches/api/Stinger-API.patch
rename to patches/unapplied/api/Stinger-API.patch
diff --git a/patches/api/Support-cancellation-supression-of-EntityDismount-Ve.patch b/patches/unapplied/api/Support-cancellation-supression-of-EntityDismount-Ve.patch
similarity index 100%
rename from patches/api/Support-cancellation-supression-of-EntityDismount-Ve.patch
rename to patches/unapplied/api/Support-cancellation-supression-of-EntityDismount-Ve.patch
diff --git a/patches/api/Support-components-in-ItemMeta.patch b/patches/unapplied/api/Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/api/Support-components-in-ItemMeta.patch
rename to patches/unapplied/api/Support-components-in-ItemMeta.patch
diff --git a/patches/api/Support-hex-colors-in-getLastColors.patch b/patches/unapplied/api/Support-hex-colors-in-getLastColors.patch
similarity index 100%
rename from patches/api/Support-hex-colors-in-getLastColors.patch
rename to patches/unapplied/api/Support-hex-colors-in-getLastColors.patch
diff --git a/patches/api/Tameable-getOwnerUniqueId-API.patch b/patches/unapplied/api/Tameable-getOwnerUniqueId-API.patch
similarity index 100%
rename from patches/api/Tameable-getOwnerUniqueId-API.patch
rename to patches/unapplied/api/Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/api/Timings-v2.patch b/patches/unapplied/api/Timings-v2.patch
similarity index 100%
rename from patches/api/Timings-v2.patch
rename to patches/unapplied/api/Timings-v2.patch
diff --git a/patches/api/Turtle-API.patch b/patches/unapplied/api/Turtle-API.patch
similarity index 100%
rename from patches/api/Turtle-API.patch
rename to patches/unapplied/api/Turtle-API.patch
diff --git a/patches/api/Use-ASM-for-event-executors.patch b/patches/unapplied/api/Use-ASM-for-event-executors.patch
similarity index 100%
rename from patches/api/Use-ASM-for-event-executors.patch
rename to patches/unapplied/api/Use-ASM-for-event-executors.patch
diff --git a/patches/api/Version-Command-2.0.patch b/patches/unapplied/api/Version-Command-2.0.patch
similarity index 100%
rename from patches/api/Version-Command-2.0.patch
rename to patches/unapplied/api/Version-Command-2.0.patch
diff --git a/patches/api/Villager-Restocks-API.patch b/patches/unapplied/api/Villager-Restocks-API.patch
similarity index 100%
rename from patches/api/Villager-Restocks-API.patch
rename to patches/unapplied/api/Villager-Restocks-API.patch
diff --git a/patches/api/Villager-resetOffers.patch b/patches/unapplied/api/Villager-resetOffers.patch
similarity index 100%
rename from patches/api/Villager-resetOffers.patch
rename to patches/unapplied/api/Villager-resetOffers.patch
diff --git a/patches/api/WitchConsumePotionEvent.patch b/patches/unapplied/api/WitchConsumePotionEvent.patch
similarity index 100%
rename from patches/api/WitchConsumePotionEvent.patch
rename to patches/unapplied/api/WitchConsumePotionEvent.patch
diff --git a/patches/api/WitchReadyPotionEvent.patch b/patches/unapplied/api/WitchReadyPotionEvent.patch
similarity index 100%
rename from patches/api/WitchReadyPotionEvent.patch
rename to patches/unapplied/api/WitchReadyPotionEvent.patch
diff --git a/patches/api/WitchThrowPotionEvent.patch b/patches/unapplied/api/WitchThrowPotionEvent.patch
similarity index 100%
rename from patches/api/WitchThrowPotionEvent.patch
rename to patches/unapplied/api/WitchThrowPotionEvent.patch
diff --git a/patches/api/Zombie-API-breaking-doors.patch b/patches/unapplied/api/Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/api/Zombie-API-breaking-doors.patch
rename to patches/unapplied/api/Zombie-API-breaking-doors.patch
diff --git a/patches/api/add-DragonEggFormEvent.patch b/patches/unapplied/api/add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/api/add-DragonEggFormEvent.patch
rename to patches/unapplied/api/add-DragonEggFormEvent.patch
diff --git a/patches/api/add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/unapplied/api/add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from patches/api/add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/unapplied/api/add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/api/add-back-EntityPortalExitEvent.patch b/patches/unapplied/api/add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/api/add-back-EntityPortalExitEvent.patch
rename to patches/unapplied/api/add-back-EntityPortalExitEvent.patch
diff --git a/patches/api/add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/unapplied/api/add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/api/add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/unapplied/api/add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/api/add-get-set-drop-chance-to-EntityEquipment.patch b/patches/unapplied/api/add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/api/add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/unapplied/api/add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/api/add-hand-to-BlockMultiPlaceEvent.patch b/patches/unapplied/api/add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from patches/api/add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/unapplied/api/add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/api/add-isDeeplySleeping-to-HumanEntity.patch b/patches/unapplied/api/add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/api/add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/unapplied/api/add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/api/added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/patches/unapplied/api/added-2-new-TargetReasons-for-1.16-mob-behavior.patch
similarity index 100%
rename from patches/api/added-2-new-TargetReasons-for-1.16-mob-behavior.patch
rename to patches/unapplied/api/added-2-new-TargetReasons-for-1.16-mob-behavior.patch
diff --git a/patches/api/added-PlayerNameEntityEvent.patch b/patches/unapplied/api/added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/api/added-PlayerNameEntityEvent.patch
rename to patches/unapplied/api/added-PlayerNameEntityEvent.patch
diff --git a/patches/api/added-Wither-API.patch b/patches/unapplied/api/added-Wither-API.patch
similarity index 100%
rename from patches/api/added-Wither-API.patch
rename to patches/unapplied/api/added-Wither-API.patch
diff --git a/patches/api/additions-to-PlayerGameModeChangeEvent.patch b/patches/unapplied/api/additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/api/additions-to-PlayerGameModeChangeEvent.patch
rename to patches/unapplied/api/additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/api/ensureServerConversions-API.patch b/patches/unapplied/api/ensureServerConversions-API.patch
similarity index 100%
rename from patches/api/ensureServerConversions-API.patch
rename to patches/unapplied/api/ensureServerConversions-API.patch
diff --git a/patches/api/fix-Inventory-getContents-null-annotations.patch b/patches/unapplied/api/fix-Inventory-getContents-null-annotations.patch
similarity index 100%
rename from patches/api/fix-Inventory-getContents-null-annotations.patch
rename to patches/unapplied/api/fix-Inventory-getContents-null-annotations.patch
diff --git a/patches/api/fix-empty-array-elements-in-command-arguments.patch b/patches/unapplied/api/fix-empty-array-elements-in-command-arguments.patch
similarity index 100%
rename from patches/api/fix-empty-array-elements-in-command-arguments.patch
rename to patches/unapplied/api/fix-empty-array-elements-in-command-arguments.patch
diff --git a/patches/api/getPlayerUniqueId-API.patch b/patches/unapplied/api/getPlayerUniqueId-API.patch
similarity index 100%
rename from patches/api/getPlayerUniqueId-API.patch
rename to patches/unapplied/api/getPlayerUniqueId-API.patch
diff --git a/patches/api/isChunkGenerated-API.patch b/patches/unapplied/api/isChunkGenerated-API.patch
similarity index 100%
rename from patches/api/isChunkGenerated-API.patch
rename to patches/unapplied/api/isChunkGenerated-API.patch
diff --git a/patches/api/living-entity-allow-attribute-registration.patch b/patches/unapplied/api/living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/api/living-entity-allow-attribute-registration.patch
rename to patches/unapplied/api/living-entity-allow-attribute-registration.patch
diff --git a/patches/server/API-to-get-a-BlockState-without-a-snapshot.patch b/patches/unapplied/server/API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 100%
rename from patches/server/API-to-get-a-BlockState-without-a-snapshot.patch
rename to patches/unapplied/server/API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/patches/server/Ability-to-apply-mending-to-XP-API.patch b/patches/unapplied/server/Ability-to-apply-mending-to-XP-API.patch
similarity index 100%
rename from patches/server/Ability-to-apply-mending-to-XP-API.patch
rename to patches/unapplied/server/Ability-to-apply-mending-to-XP-API.patch
diff --git a/patches/server/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/unapplied/server/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 100%
rename from patches/server/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to patches/unapplied/server/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
diff --git a/patches/server/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/unapplied/server/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 100%
rename from patches/server/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to patches/unapplied/server/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/server/Add-API-for-quit-reason.patch b/patches/unapplied/server/Add-API-for-quit-reason.patch
similarity index 100%
rename from patches/server/Add-API-for-quit-reason.patch
rename to patches/unapplied/server/Add-API-for-quit-reason.patch
diff --git a/patches/server/Add-API-for-resetting-a-single-score.patch b/patches/unapplied/server/Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/Add-API-for-resetting-a-single-score.patch
rename to patches/unapplied/server/Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/unapplied/server/Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 100%
rename from patches/server/Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to patches/unapplied/server/Add-API-methods-to-control-if-armour-stands-can-move.patch
diff --git a/patches/server/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/unapplied/server/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 100%
rename from patches/server/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to patches/unapplied/server/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/server/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/unapplied/server/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/unapplied/server/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/Add-ArmorStand-Item-Meta.patch b/patches/unapplied/server/Add-ArmorStand-Item-Meta.patch
similarity index 100%
rename from patches/server/Add-ArmorStand-Item-Meta.patch
rename to patches/unapplied/server/Add-ArmorStand-Item-Meta.patch
diff --git a/patches/server/Add-BeaconEffectEvent.patch b/patches/unapplied/server/Add-BeaconEffectEvent.patch
similarity index 100%
rename from patches/server/Add-BeaconEffectEvent.patch
rename to patches/unapplied/server/Add-BeaconEffectEvent.patch
diff --git a/patches/server/Add-BellRevealRaiderEvent.patch b/patches/unapplied/server/Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/Add-BellRevealRaiderEvent.patch
rename to patches/unapplied/server/Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/Add-BellRingEvent.patch b/patches/unapplied/server/Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/Add-BellRingEvent.patch
rename to patches/unapplied/server/Add-BellRingEvent.patch
diff --git a/patches/server/Add-Block-isValidTool.patch b/patches/unapplied/server/Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/Add-Block-isValidTool.patch
rename to patches/unapplied/server/Add-Block-isValidTool.patch
diff --git a/patches/server/Add-BlockBreakBlockEvent.patch b/patches/unapplied/server/Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/Add-BlockBreakBlockEvent.patch
rename to patches/unapplied/server/Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/Add-Channel-initialization-listeners.patch b/patches/unapplied/server/Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/Add-Channel-initialization-listeners.patch
rename to patches/unapplied/server/Add-Channel-initialization-listeners.patch
diff --git a/patches/server/Add-CraftMagicNumbers.isSupportedApiVersion.patch b/patches/unapplied/server/Add-CraftMagicNumbers.isSupportedApiVersion.patch
similarity index 100%
rename from patches/server/Add-CraftMagicNumbers.isSupportedApiVersion.patch
rename to patches/unapplied/server/Add-CraftMagicNumbers.isSupportedApiVersion.patch
diff --git a/patches/server/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/unapplied/server/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 100%
rename from patches/server/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to patches/unapplied/server/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
diff --git a/patches/server/Add-Destroy-Speed-API.patch b/patches/unapplied/server/Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/Add-Destroy-Speed-API.patch
rename to patches/unapplied/server/Add-Destroy-Speed-API.patch
diff --git a/patches/server/Add-Early-Warning-Feature-to-WatchDog.patch b/patches/unapplied/server/Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 100%
rename from patches/server/Add-Early-Warning-Feature-to-WatchDog.patch
rename to patches/unapplied/server/Add-Early-Warning-Feature-to-WatchDog.patch
diff --git a/patches/server/Add-ElderGuardianAppearanceEvent.patch b/patches/unapplied/server/Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/Add-ElderGuardianAppearanceEvent.patch
rename to patches/unapplied/server/Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/Add-EntityBlockStorage-clearEntities.patch b/patches/unapplied/server/Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/Add-EntityBlockStorage-clearEntities.patch
rename to patches/unapplied/server/Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/Add-EntityInsideBlockEvent.patch b/patches/unapplied/server/Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/Add-EntityInsideBlockEvent.patch
rename to patches/unapplied/server/Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/Add-EntityLoadCrossbowEvent.patch b/patches/unapplied/server/Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/Add-EntityLoadCrossbowEvent.patch
rename to patches/unapplied/server/Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/Add-EntityZapEvent.patch b/patches/unapplied/server/Add-EntityZapEvent.patch
similarity index 100%
rename from patches/server/Add-EntityZapEvent.patch
rename to patches/unapplied/server/Add-EntityZapEvent.patch
diff --git a/patches/server/Add-Heightmap-API.patch b/patches/unapplied/server/Add-Heightmap-API.patch
similarity index 100%
rename from patches/server/Add-Heightmap-API.patch
rename to patches/unapplied/server/Add-Heightmap-API.patch
diff --git a/patches/server/Add-ItemFactory-getMonsterEgg-API.patch b/patches/unapplied/server/Add-ItemFactory-getMonsterEgg-API.patch
similarity index 100%
rename from patches/server/Add-ItemFactory-getMonsterEgg-API.patch
rename to patches/unapplied/server/Add-ItemFactory-getMonsterEgg-API.patch
diff --git a/patches/server/Add-LivingEntity-clearActiveItem.patch b/patches/unapplied/server/Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/Add-LivingEntity-clearActiveItem.patch
rename to patches/unapplied/server/Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/Add-LivingEntity-getTargetEntity.patch b/patches/unapplied/server/Add-LivingEntity-getTargetEntity.patch
similarity index 100%
rename from patches/server/Add-LivingEntity-getTargetEntity.patch
rename to patches/unapplied/server/Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/server/Add-MinecraftKey-Information-to-Objects.patch b/patches/unapplied/server/Add-MinecraftKey-Information-to-Objects.patch
similarity index 100%
rename from patches/server/Add-MinecraftKey-Information-to-Objects.patch
rename to patches/unapplied/server/Add-MinecraftKey-Information-to-Objects.patch
diff --git a/patches/server/Add-Mob-lookAt-API.patch b/patches/unapplied/server/Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/Add-Mob-lookAt-API.patch
rename to patches/unapplied/server/Add-Mob-lookAt-API.patch
diff --git a/patches/server/Add-More-Creeper-API.patch b/patches/unapplied/server/Add-More-Creeper-API.patch
similarity index 100%
rename from patches/server/Add-More-Creeper-API.patch
rename to patches/unapplied/server/Add-More-Creeper-API.patch
diff --git a/patches/server/Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/unapplied/server/Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/unapplied/server/Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/Add-PhantomPreSpawnEvent.patch b/patches/unapplied/server/Add-PhantomPreSpawnEvent.patch
similarity index 100%
rename from patches/server/Add-PhantomPreSpawnEvent.patch
rename to patches/unapplied/server/Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/Add-PlayerArmorChangeEvent.patch b/patches/unapplied/server/Add-PlayerArmorChangeEvent.patch
similarity index 100%
rename from patches/server/Add-PlayerArmorChangeEvent.patch
rename to patches/unapplied/server/Add-PlayerArmorChangeEvent.patch
diff --git a/patches/server/Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/unapplied/server/Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from patches/server/Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/unapplied/server/Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/Add-PlayerConnectionCloseEvent.patch b/patches/unapplied/server/Add-PlayerConnectionCloseEvent.patch
similarity index 100%
rename from patches/server/Add-PlayerConnectionCloseEvent.patch
rename to patches/unapplied/server/Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/Add-PlayerInitialSpawnEvent.patch b/patches/unapplied/server/Add-PlayerInitialSpawnEvent.patch
similarity index 100%
rename from patches/server/Add-PlayerInitialSpawnEvent.patch
rename to patches/unapplied/server/Add-PlayerInitialSpawnEvent.patch
diff --git a/patches/server/Add-PlayerItemCooldownEvent.patch b/patches/unapplied/server/Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/Add-PlayerItemCooldownEvent.patch
rename to patches/unapplied/server/Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/Add-PlayerJumpEvent.patch b/patches/unapplied/server/Add-PlayerJumpEvent.patch
similarity index 100%
rename from patches/server/Add-PlayerJumpEvent.patch
rename to patches/unapplied/server/Add-PlayerJumpEvent.patch
diff --git a/patches/server/Add-PlayerKickEvent-causes.patch b/patches/unapplied/server/Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/server/Add-PlayerKickEvent-causes.patch
rename to patches/unapplied/server/Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/Add-PlayerSetSpawnEvent.patch b/patches/unapplied/server/Add-PlayerSetSpawnEvent.patch
similarity index 100%
rename from patches/server/Add-PlayerSetSpawnEvent.patch
rename to patches/unapplied/server/Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/Add-PlayerShearBlockEvent.patch b/patches/unapplied/server/Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/Add-PlayerShearBlockEvent.patch
rename to patches/unapplied/server/Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/unapplied/server/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/unapplied/server/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/Add-PlayerUseUnknownEntityEvent.patch b/patches/unapplied/server/Add-PlayerUseUnknownEntityEvent.patch
similarity index 100%
rename from patches/server/Add-PlayerUseUnknownEntityEvent.patch
rename to patches/unapplied/server/Add-PlayerUseUnknownEntityEvent.patch
diff --git a/patches/server/Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/unapplied/server/Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 100%
rename from patches/server/Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/unapplied/server/Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/Add-PrepareResultEvent.patch b/patches/unapplied/server/Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/Add-PrepareResultEvent.patch
rename to patches/unapplied/server/Add-PrepareResultEvent.patch
diff --git a/patches/server/Add-ProjectileCollideEvent.patch b/patches/unapplied/server/Add-ProjectileCollideEvent.patch
similarity index 100%
rename from patches/server/Add-ProjectileCollideEvent.patch
rename to patches/unapplied/server/Add-ProjectileCollideEvent.patch
diff --git a/patches/server/Add-PufferFishStateChangeEvent.patch b/patches/unapplied/server/Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/Add-PufferFishStateChangeEvent.patch
rename to patches/unapplied/server/Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/Add-Raw-Byte-Entity-Serialization.patch b/patches/unapplied/server/Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/server/Add-Raw-Byte-Entity-Serialization.patch
rename to patches/unapplied/server/Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/Add-Raw-Byte-ItemStack-Serialization.patch b/patches/unapplied/server/Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from patches/server/Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/unapplied/server/Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/Add-StructureLocateEvent.patch b/patches/unapplied/server/Add-StructureLocateEvent.patch
similarity index 100%
rename from patches/server/Add-StructureLocateEvent.patch
rename to patches/unapplied/server/Add-StructureLocateEvent.patch
diff --git a/patches/server/Add-System.out-err-catcher.patch b/patches/unapplied/server/Add-System.out-err-catcher.patch
similarity index 100%
rename from patches/server/Add-System.out-err-catcher.patch
rename to patches/unapplied/server/Add-System.out-err-catcher.patch
diff --git a/patches/server/Add-TNTPrimeEvent.patch b/patches/unapplied/server/Add-TNTPrimeEvent.patch
similarity index 100%
rename from patches/server/Add-TNTPrimeEvent.patch
rename to patches/unapplied/server/Add-TNTPrimeEvent.patch
diff --git a/patches/server/Add-ThrownEggHatchEvent.patch b/patches/unapplied/server/Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/server/Add-ThrownEggHatchEvent.patch
rename to patches/unapplied/server/Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/Add-Unix-domain-socket-support.patch b/patches/unapplied/server/Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/Add-Unix-domain-socket-support.patch
rename to patches/unapplied/server/Add-Unix-domain-socket-support.patch
diff --git a/patches/server/Add-UnknownCommandEvent.patch b/patches/unapplied/server/Add-UnknownCommandEvent.patch
similarity index 100%
rename from patches/server/Add-UnknownCommandEvent.patch
rename to patches/unapplied/server/Add-UnknownCommandEvent.patch
diff --git a/patches/server/Add-Velocity-IP-Forwarding-Support.patch b/patches/unapplied/server/Add-Velocity-IP-Forwarding-Support.patch
similarity index 100%
rename from patches/server/Add-Velocity-IP-Forwarding-Support.patch
rename to patches/unapplied/server/Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/unapplied/server/Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/unapplied/server/Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/Add-World-Util-Methods.patch b/patches/unapplied/server/Add-World-Util-Methods.patch
similarity index 100%
rename from patches/server/Add-World-Util-Methods.patch
rename to patches/unapplied/server/Add-World-Util-Methods.patch
diff --git a/patches/server/Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/unapplied/server/Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/unapplied/server/Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/unapplied/server/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/unapplied/server/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/Add-ability-to-configure-frosted_ice-properties.patch b/patches/unapplied/server/Add-ability-to-configure-frosted_ice-properties.patch
similarity index 100%
rename from patches/server/Add-ability-to-configure-frosted_ice-properties.patch
rename to patches/unapplied/server/Add-ability-to-configure-frosted_ice-properties.patch
diff --git a/patches/server/Add-additional-open-container-api-to-HumanEntity.patch b/patches/unapplied/server/Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/unapplied/server/Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/Add-advancement-display-API.patch b/patches/unapplied/server/Add-advancement-display-API.patch
similarity index 100%
rename from patches/server/Add-advancement-display-API.patch
rename to patches/unapplied/server/Add-advancement-display-API.patch
diff --git a/patches/server/Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/unapplied/server/Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from patches/server/Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/unapplied/server/Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/Add-back-EntityPortalExitEvent.patch b/patches/unapplied/server/Add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/server/Add-back-EntityPortalExitEvent.patch
rename to patches/unapplied/server/Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/Add-basic-Datapack-API.patch b/patches/unapplied/server/Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/Add-basic-Datapack-API.patch
rename to patches/unapplied/server/Add-basic-Datapack-API.patch
diff --git a/patches/server/Add-bypass-host-check.patch b/patches/unapplied/server/Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/Add-bypass-host-check.patch
rename to patches/unapplied/server/Add-bypass-host-check.patch
diff --git a/patches/server/Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/unapplied/server/Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/server/Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/unapplied/server/Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/unapplied/server/Add-command-line-option-to-load-extra-plugin-jars-no.patch
similarity index 100%
rename from patches/server/Add-command-line-option-to-load-extra-plugin-jars-no.patch
rename to patches/unapplied/server/Add-command-line-option-to-load-extra-plugin-jars-no.patch
diff --git a/patches/server/Add-config-for-mobs-immune-to-default-effects.patch b/patches/unapplied/server/Add-config-for-mobs-immune-to-default-effects.patch
similarity index 100%
rename from patches/server/Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/unapplied/server/Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/Add-config-option-for-logging-player-ip-addresses.patch b/patches/unapplied/server/Add-config-option-for-logging-player-ip-addresses.patch
similarity index 100%
rename from patches/server/Add-config-option-for-logging-player-ip-addresses.patch
rename to patches/unapplied/server/Add-config-option-for-logging-player-ip-addresses.patch
diff --git a/patches/server/Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/unapplied/server/Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 100%
rename from patches/server/Add-config-to-disable-ender-dragon-legacy-check.patch
rename to patches/unapplied/server/Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/patches/server/Add-configurable-despawn-distances-for-living-entiti.patch b/patches/unapplied/server/Add-configurable-despawn-distances-for-living-entiti.patch
similarity index 100%
rename from patches/server/Add-configurable-despawn-distances-for-living-entiti.patch
rename to patches/unapplied/server/Add-configurable-despawn-distances-for-living-entiti.patch
diff --git a/patches/server/Add-configurable-portal-search-radius.patch b/patches/unapplied/server/Add-configurable-portal-search-radius.patch
similarity index 100%
rename from patches/server/Add-configurable-portal-search-radius.patch
rename to patches/unapplied/server/Add-configurable-portal-search-radius.patch
diff --git a/patches/server/Add-configuration-option-to-prevent-player-names-fro.patch b/patches/unapplied/server/Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 100%
rename from patches/server/Add-configuration-option-to-prevent-player-names-fro.patch
rename to patches/unapplied/server/Add-configuration-option-to-prevent-player-names-fro.patch
diff --git a/patches/server/Add-critical-damage-API.patch b/patches/unapplied/server/Add-critical-damage-API.patch
similarity index 100%
rename from patches/server/Add-critical-damage-API.patch
rename to patches/unapplied/server/Add-critical-damage-API.patch
diff --git a/patches/server/Add-debug-for-sync-chunk-loads.patch b/patches/unapplied/server/Add-debug-for-sync-chunk-loads.patch
similarity index 100%
rename from patches/server/Add-debug-for-sync-chunk-loads.patch
rename to patches/unapplied/server/Add-debug-for-sync-chunk-loads.patch
diff --git a/patches/server/Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/unapplied/server/Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/unapplied/server/Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/Add-effect-to-block-break-naturally.patch b/patches/unapplied/server/Add-effect-to-block-break-naturally.patch
similarity index 100%
rename from patches/server/Add-effect-to-block-break-naturally.patch
rename to patches/unapplied/server/Add-effect-to-block-break-naturally.patch
diff --git a/patches/server/Add-entity-liquid-API.patch b/patches/unapplied/server/Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/Add-entity-liquid-API.patch
rename to patches/unapplied/server/Add-entity-liquid-API.patch
diff --git a/patches/server/Add-environment-variable-to-disable-server-gui.patch b/patches/unapplied/server/Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/Add-environment-variable-to-disable-server-gui.patch
rename to patches/unapplied/server/Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/Add-exception-reporting-event.patch b/patches/unapplied/server/Add-exception-reporting-event.patch
similarity index 100%
rename from patches/server/Add-exception-reporting-event.patch
rename to patches/unapplied/server/Add-exception-reporting-event.patch
diff --git a/patches/server/Add-fast-alternative-constructor-for-Rotations.patch b/patches/unapplied/server/Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/unapplied/server/Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/unapplied/server/Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/unapplied/server/Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/Add-getOfflinePlayerIfCached-String.patch b/patches/unapplied/server/Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/server/Add-getOfflinePlayerIfCached-String.patch
rename to patches/unapplied/server/Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/Add-git-branch-and-commit-to-manifest.patch b/patches/unapplied/server/Add-git-branch-and-commit-to-manifest.patch
similarity index 100%
rename from patches/server/Add-git-branch-and-commit-to-manifest.patch
rename to patches/unapplied/server/Add-git-branch-and-commit-to-manifest.patch
diff --git a/patches/server/Add-hand-to-bucket-events.patch b/patches/unapplied/server/Add-hand-to-bucket-events.patch
similarity index 100%
rename from patches/server/Add-hand-to-bucket-events.patch
rename to patches/unapplied/server/Add-hand-to-bucket-events.patch
diff --git a/patches/server/Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/unapplied/server/Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 100%
rename from patches/server/Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to patches/unapplied/server/Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/patches/server/Add-ignore-discounts-API.patch b/patches/unapplied/server/Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/Add-ignore-discounts-API.patch
rename to patches/unapplied/server/Add-ignore-discounts-API.patch
diff --git a/patches/server/Add-isCollidable-methods-to-various-places.patch b/patches/unapplied/server/Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/Add-isCollidable-methods-to-various-places.patch
rename to patches/unapplied/server/Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/Add-method-to-open-already-placed-sign.patch b/patches/unapplied/server/Add-method-to-open-already-placed-sign.patch
similarity index 100%
rename from patches/server/Add-method-to-open-already-placed-sign.patch
rename to patches/unapplied/server/Add-method-to-open-already-placed-sign.patch
diff --git a/patches/server/Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/unapplied/server/Add-methods-for-working-with-arrows-stuck-in-living-.patch
similarity index 100%
rename from patches/server/Add-methods-for-working-with-arrows-stuck-in-living-.patch
rename to patches/unapplied/server/Add-methods-for-working-with-arrows-stuck-in-living-.patch
diff --git a/patches/server/Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/unapplied/server/Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 100%
rename from patches/server/Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/unapplied/server/Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/Add-methods-to-get-translation-keys.patch b/patches/unapplied/server/Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/server/Add-methods-to-get-translation-keys.patch
rename to patches/unapplied/server/Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/unapplied/server/Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 100%
rename from patches/server/Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to patches/unapplied/server/Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/patches/server/Add-missing-team-sidebar-display-slots.patch b/patches/unapplied/server/Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/Add-missing-team-sidebar-display-slots.patch
rename to patches/unapplied/server/Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/Add-moon-phase-API.patch b/patches/unapplied/server/Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/Add-moon-phase-API.patch
rename to patches/unapplied/server/Add-moon-phase-API.patch
diff --git a/patches/server/Add-more-Evoker-API.patch b/patches/unapplied/server/Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/Add-more-Evoker-API.patch
rename to patches/unapplied/server/Add-more-Evoker-API.patch
diff --git a/patches/server/Add-more-LimitedRegion-API.patch b/patches/unapplied/server/Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/Add-more-LimitedRegion-API.patch
rename to patches/unapplied/server/Add-more-LimitedRegion-API.patch
diff --git a/patches/server/Add-more-WanderingTrader-API.patch b/patches/unapplied/server/Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/Add-more-WanderingTrader-API.patch
rename to patches/unapplied/server/Add-more-WanderingTrader-API.patch
diff --git a/patches/server/Add-more-Witch-API.patch b/patches/unapplied/server/Add-more-Witch-API.patch
similarity index 100%
rename from patches/server/Add-more-Witch-API.patch
rename to patches/unapplied/server/Add-more-Witch-API.patch
diff --git a/patches/server/Add-more-Zombie-API.patch b/patches/unapplied/server/Add-more-Zombie-API.patch
similarity index 100%
rename from patches/server/Add-more-Zombie-API.patch
rename to patches/unapplied/server/Add-more-Zombie-API.patch
diff --git a/patches/server/Add-more-async-catchers.patch b/patches/unapplied/server/Add-more-async-catchers.patch
similarity index 100%
rename from patches/server/Add-more-async-catchers.patch
rename to patches/unapplied/server/Add-more-async-catchers.patch
diff --git a/patches/server/Add-option-for-console-having-all-permissions.patch b/patches/unapplied/server/Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from patches/server/Add-option-for-console-having-all-permissions.patch
rename to patches/unapplied/server/Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/unapplied/server/Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from patches/server/Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to patches/unapplied/server/Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/Add-option-to-disable-pillager-patrols.patch b/patches/unapplied/server/Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from patches/server/Add-option-to-disable-pillager-patrols.patch
rename to patches/unapplied/server/Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/Add-option-to-fix-items-merging-through-walls.patch b/patches/unapplied/server/Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/Add-option-to-fix-items-merging-through-walls.patch
rename to patches/unapplied/server/Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/unapplied/server/Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 100%
rename from patches/server/Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to patches/unapplied/server/Add-option-to-make-parrots-stay-on-shoulders-despite.patch
diff --git a/patches/server/Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/unapplied/server/Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 100%
rename from patches/server/Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to patches/unapplied/server/Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/patches/server/Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/unapplied/server/Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 100%
rename from patches/server/Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to patches/unapplied/server/Add-option-to-prevent-players-from-moving-into-unloa.patch
diff --git a/patches/server/Add-packet-limiter-config.patch b/patches/unapplied/server/Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/Add-packet-limiter-config.patch
rename to patches/unapplied/server/Add-packet-limiter-config.patch
diff --git a/patches/server/Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/unapplied/server/Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 100%
rename from patches/server/Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/unapplied/server/Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/Add-permission-for-command-blocks.patch b/patches/unapplied/server/Add-permission-for-command-blocks.patch
similarity index 100%
rename from patches/server/Add-permission-for-command-blocks.patch
rename to patches/unapplied/server/Add-permission-for-command-blocks.patch
diff --git a/patches/server/Add-phantom-creative-and-insomniac-controls.patch b/patches/unapplied/server/Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from patches/server/Add-phantom-creative-and-insomniac-controls.patch
rename to patches/unapplied/server/Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/unapplied/server/Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/unapplied/server/Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/server/Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/unapplied/server/Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/Add-ray-tracing-methods-to-LivingEntity.patch b/patches/unapplied/server/Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 100%
rename from patches/server/Add-ray-tracing-methods-to-LivingEntity.patch
rename to patches/unapplied/server/Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/patches/server/Add-recipe-to-cook-events.patch b/patches/unapplied/server/Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/Add-recipe-to-cook-events.patch
rename to patches/unapplied/server/Add-recipe-to-cook-events.patch
diff --git a/patches/server/Add-root-admin-user-detection.patch b/patches/unapplied/server/Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/Add-root-admin-user-detection.patch
rename to patches/unapplied/server/Add-root-admin-user-detection.patch
diff --git a/patches/server/Add-sendOpLevel-API.patch b/patches/unapplied/server/Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/server/Add-sendOpLevel-API.patch
rename to patches/unapplied/server/Add-sendOpLevel-API.patch
diff --git a/patches/server/Add-server-name-parameter.patch b/patches/unapplied/server/Add-server-name-parameter.patch
similarity index 100%
rename from patches/server/Add-server-name-parameter.patch
rename to patches/unapplied/server/Add-server-name-parameter.patch
diff --git a/patches/server/Add-setMaxPlayers-API.patch b/patches/unapplied/server/Add-setMaxPlayers-API.patch
similarity index 100%
rename from patches/server/Add-setMaxPlayers-API.patch
rename to patches/unapplied/server/Add-setMaxPlayers-API.patch
diff --git a/patches/server/Add-setPlayerProfile-API-for-Skulls.patch b/patches/unapplied/server/Add-setPlayerProfile-API-for-Skulls.patch
similarity index 100%
rename from patches/server/Add-setPlayerProfile-API-for-Skulls.patch
rename to patches/unapplied/server/Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/server/Add-setting-for-proxy-online-mode-status.patch b/patches/unapplied/server/Add-setting-for-proxy-online-mode-status.patch
similarity index 100%
rename from patches/server/Add-setting-for-proxy-online-mode-status.patch
rename to patches/unapplied/server/Add-setting-for-proxy-online-mode-status.patch
diff --git a/patches/server/Add-source-to-PlayerExpChangeEvent.patch b/patches/unapplied/server/Add-source-to-PlayerExpChangeEvent.patch
similarity index 100%
rename from patches/server/Add-source-to-PlayerExpChangeEvent.patch
rename to patches/unapplied/server/Add-source-to-PlayerExpChangeEvent.patch
diff --git a/patches/server/Add-sun-related-API.patch b/patches/unapplied/server/Add-sun-related-API.patch
similarity index 100%
rename from patches/server/Add-sun-related-API.patch
rename to patches/unapplied/server/Add-sun-related-API.patch
diff --git a/patches/server/Add-support-for-hex-color-codes-in-console.patch b/patches/unapplied/server/Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from patches/server/Add-support-for-hex-color-codes-in-console.patch
rename to patches/unapplied/server/Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/Add-tick-times-API-and-mspt-command.patch b/patches/unapplied/server/Add-tick-times-API-and-mspt-command.patch
similarity index 100%
rename from patches/server/Add-tick-times-API-and-mspt-command.patch
rename to patches/unapplied/server/Add-tick-times-API-and-mspt-command.patch
diff --git a/patches/server/Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/unapplied/server/Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/unapplied/server/Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/Add-velocity-warnings.patch b/patches/unapplied/server/Add-velocity-warnings.patch
similarity index 100%
rename from patches/server/Add-velocity-warnings.patch
rename to patches/unapplied/server/Add-velocity-warnings.patch
diff --git a/patches/server/Add-version-history-to-version-command.patch b/patches/unapplied/server/Add-version-history-to-version-command.patch
similarity index 100%
rename from patches/server/Add-version-history-to-version-command.patch
rename to patches/unapplied/server/Add-version-history-to-version-command.patch
diff --git a/patches/server/Add-villager-reputation-API.patch b/patches/unapplied/server/Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/Add-villager-reputation-API.patch
rename to patches/unapplied/server/Add-villager-reputation-API.patch
diff --git a/patches/server/Add-worldborder-events.patch b/patches/unapplied/server/Add-worldborder-events.patch
similarity index 100%
rename from patches/server/Add-worldborder-events.patch
rename to patches/unapplied/server/Add-worldborder-events.patch
diff --git a/patches/server/Add-zombie-targets-turtle-egg-config.patch b/patches/unapplied/server/Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/Add-zombie-targets-turtle-egg-config.patch
rename to patches/unapplied/server/Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/Added-EntityDamageItemEvent.patch b/patches/unapplied/server/Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/Added-EntityDamageItemEvent.patch
rename to patches/unapplied/server/Added-EntityDamageItemEvent.patch
diff --git a/patches/server/Added-PlayerBedFailEnterEvent.patch b/patches/unapplied/server/Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/Added-PlayerBedFailEnterEvent.patch
rename to patches/unapplied/server/Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/Added-PlayerDeepSleepEvent.patch b/patches/unapplied/server/Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/Added-PlayerDeepSleepEvent.patch
rename to patches/unapplied/server/Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/Added-PlayerLecternPageChangeEvent.patch b/patches/unapplied/server/Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/Added-PlayerLecternPageChangeEvent.patch
rename to patches/unapplied/server/Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/Added-PlayerLoomPatternSelectEvent.patch b/patches/unapplied/server/Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/Added-PlayerLoomPatternSelectEvent.patch
rename to patches/unapplied/server/Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/unapplied/server/Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/unapplied/server/Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/Added-ServerResourcesReloadedEvent.patch b/patches/unapplied/server/Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/Added-ServerResourcesReloadedEvent.patch
rename to patches/unapplied/server/Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/Added-Vanilla-Entity-Tags.patch b/patches/unapplied/server/Added-Vanilla-Entity-Tags.patch
similarity index 100%
rename from patches/server/Added-Vanilla-Entity-Tags.patch
rename to patches/unapplied/server/Added-Vanilla-Entity-Tags.patch
diff --git a/patches/server/Added-WorldGameRuleChangeEvent.patch b/patches/unapplied/server/Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/Added-WorldGameRuleChangeEvent.patch
rename to patches/unapplied/server/Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/unapplied/server/Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/unapplied/server/Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/Added-missing-default-perms-for-commands.patch b/patches/unapplied/server/Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/Added-missing-default-perms-for-commands.patch
rename to patches/unapplied/server/Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/Added-world-settings-for-mobs-picking-up-loot.patch b/patches/unapplied/server/Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/unapplied/server/Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/Additional-Block-Material-API-s.patch b/patches/unapplied/server/Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/Additional-Block-Material-API-s.patch
rename to patches/unapplied/server/Additional-Block-Material-API-s.patch
diff --git a/patches/server/Adds-PlayerArmSwingEvent.patch b/patches/unapplied/server/Adds-PlayerArmSwingEvent.patch
similarity index 100%
rename from patches/server/Adds-PlayerArmSwingEvent.patch
rename to patches/unapplied/server/Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/Adventure.patch b/patches/unapplied/server/Adventure.patch
similarity index 100%
rename from patches/server/Adventure.patch
rename to patches/unapplied/server/Adventure.patch
diff --git a/patches/server/All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/unapplied/server/All-chunks-are-slime-spawn-chunks-toggle.patch
similarity index 100%
rename from patches/server/All-chunks-are-slime-spawn-chunks-toggle.patch
rename to patches/unapplied/server/All-chunks-are-slime-spawn-chunks-toggle.patch
diff --git a/patches/server/Allow-Reloading-of-Command-Aliases.patch b/patches/unapplied/server/Allow-Reloading-of-Command-Aliases.patch
similarity index 100%
rename from patches/server/Allow-Reloading-of-Command-Aliases.patch
rename to patches/unapplied/server/Allow-Reloading-of-Command-Aliases.patch
diff --git a/patches/server/Allow-Reloading-of-Custom-Permissions.patch b/patches/unapplied/server/Allow-Reloading-of-Custom-Permissions.patch
similarity index 100%
rename from patches/server/Allow-Reloading-of-Custom-Permissions.patch
rename to patches/unapplied/server/Allow-Reloading-of-Custom-Permissions.patch
diff --git a/patches/server/Allow-Saving-of-Oversized-Chunks.patch b/patches/unapplied/server/Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from patches/server/Allow-Saving-of-Oversized-Chunks.patch
rename to patches/unapplied/server/Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/Allow-adding-items-to-BlockDropItemEvent.patch b/patches/unapplied/server/Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/unapplied/server/Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/Allow-chests-to-be-placed-with-NBT-data.patch b/patches/unapplied/server/Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 100%
rename from patches/server/Allow-chests-to-be-placed-with-NBT-data.patch
rename to patches/unapplied/server/Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/Allow-controlled-flushing-for-network-manager.patch b/patches/unapplied/server/Allow-controlled-flushing-for-network-manager.patch
similarity index 100%
rename from patches/server/Allow-controlled-flushing-for-network-manager.patch
rename to patches/unapplied/server/Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/Allow-delegation-to-vanilla-chunk-gen.patch b/patches/unapplied/server/Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/unapplied/server/Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/Allow-disabling-armour-stand-ticking.patch b/patches/unapplied/server/Allow-disabling-armour-stand-ticking.patch
similarity index 100%
rename from patches/server/Allow-disabling-armour-stand-ticking.patch
rename to patches/unapplied/server/Allow-disabling-armour-stand-ticking.patch
diff --git a/patches/server/Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/unapplied/server/Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/unapplied/server/Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/unapplied/server/Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
similarity index 100%
rename from patches/server/Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
rename to patches/unapplied/server/Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
diff --git a/patches/server/Allow-for-toggling-of-spawn-chunks.patch b/patches/unapplied/server/Allow-for-toggling-of-spawn-chunks.patch
similarity index 100%
rename from patches/server/Allow-for-toggling-of-spawn-chunks.patch
rename to patches/unapplied/server/Allow-for-toggling-of-spawn-chunks.patch
diff --git a/patches/server/Allow-nerfed-mobs-to-jump-and-take-water-damage.patch b/patches/unapplied/server/Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
similarity index 100%
rename from patches/server/Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
rename to patches/unapplied/server/Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
diff --git a/patches/server/Allow-overriding-the-java-version-check.patch b/patches/unapplied/server/Allow-overriding-the-java-version-check.patch
similarity index 100%
rename from patches/server/Allow-overriding-the-java-version-check.patch
rename to patches/unapplied/server/Allow-overriding-the-java-version-check.patch
diff --git a/patches/server/Allow-removal-addition-of-entities-to-entity-ticklis.patch b/patches/unapplied/server/Allow-removal-addition-of-entities-to-entity-ticklis.patch
similarity index 100%
rename from patches/server/Allow-removal-addition-of-entities-to-entity-ticklis.patch
rename to patches/unapplied/server/Allow-removal-addition-of-entities-to-entity-ticklis.patch
diff --git a/patches/server/Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/unapplied/server/Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/unapplied/server/Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/unapplied/server/Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 100%
rename from patches/server/Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to patches/unapplied/server/Allow-spawning-Item-entities-with-World.spawnEntity.patch
diff --git a/patches/server/Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/unapplied/server/Allow-specifying-a-custom-authentication-servers-dow.patch
similarity index 100%
rename from patches/server/Allow-specifying-a-custom-authentication-servers-dow.patch
rename to patches/unapplied/server/Allow-specifying-a-custom-authentication-servers-dow.patch
diff --git a/patches/server/Allow-using-signs-inside-spawn-protection.patch b/patches/unapplied/server/Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from patches/server/Allow-using-signs-inside-spawn-protection.patch
rename to patches/unapplied/server/Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/Always-allow-item-changing-in-Fireball.patch b/patches/unapplied/server/Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/Always-allow-item-changing-in-Fireball.patch
rename to patches/unapplied/server/Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/unapplied/server/Always-parse-protochunk-light-sources-unless-it-is-m.patch
similarity index 100%
rename from patches/server/Always-parse-protochunk-light-sources-unless-it-is-m.patch
rename to patches/unapplied/server/Always-parse-protochunk-light-sources-unless-it-is-m.patch
diff --git a/patches/server/Always-tick-falling-blocks.patch b/patches/unapplied/server/Always-tick-falling-blocks.patch
similarity index 100%
rename from patches/server/Always-tick-falling-blocks.patch
rename to patches/unapplied/server/Always-tick-falling-blocks.patch
diff --git a/patches/server/Anti-Xray.patch b/patches/unapplied/server/Anti-Xray.patch
similarity index 100%
rename from patches/server/Anti-Xray.patch
rename to patches/unapplied/server/Anti-Xray.patch
diff --git a/patches/server/AnvilDamageEvent.patch b/patches/unapplied/server/AnvilDamageEvent.patch
similarity index 100%
rename from patches/server/AnvilDamageEvent.patch
rename to patches/unapplied/server/AnvilDamageEvent.patch
diff --git a/patches/server/Async-catch-modifications-to-critical-entity-state.patch b/patches/unapplied/server/Async-catch-modifications-to-critical-entity-state.patch
similarity index 100%
rename from patches/server/Async-catch-modifications-to-critical-entity-state.patch
rename to patches/unapplied/server/Async-catch-modifications-to-critical-entity-state.patch
diff --git a/patches/server/Async-command-map-building.patch b/patches/unapplied/server/Async-command-map-building.patch
similarity index 100%
rename from patches/server/Async-command-map-building.patch
rename to patches/unapplied/server/Async-command-map-building.patch
diff --git a/patches/server/AsyncTabCompleteEvent.patch b/patches/unapplied/server/AsyncTabCompleteEvent.patch
similarity index 100%
rename from patches/server/AsyncTabCompleteEvent.patch
rename to patches/unapplied/server/AsyncTabCompleteEvent.patch
diff --git a/patches/server/Asynchronous-chunk-IO-and-loading.patch b/patches/unapplied/server/Asynchronous-chunk-IO-and-loading.patch
similarity index 100%
rename from patches/server/Asynchronous-chunk-IO-and-loading.patch
rename to patches/unapplied/server/Asynchronous-chunk-IO-and-loading.patch
diff --git a/patches/server/Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/unapplied/server/Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/unapplied/server/Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/Attributes-API-for-item-defaults.patch b/patches/unapplied/server/Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/Attributes-API-for-item-defaults.patch
rename to patches/unapplied/server/Attributes-API-for-item-defaults.patch
diff --git a/patches/server/Avoid-blocking-on-Network-Manager-creation.patch b/patches/unapplied/server/Avoid-blocking-on-Network-Manager-creation.patch
similarity index 100%
rename from patches/server/Avoid-blocking-on-Network-Manager-creation.patch
rename to patches/unapplied/server/Avoid-blocking-on-Network-Manager-creation.patch
diff --git a/patches/server/Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/unapplied/server/Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/unapplied/server/Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/Avoid-hopper-searches-if-there-are-no-items.patch b/patches/unapplied/server/Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 100%
rename from patches/server/Avoid-hopper-searches-if-there-are-no-items.patch
rename to patches/unapplied/server/Avoid-hopper-searches-if-there-are-no-items.patch
diff --git a/patches/server/Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/patches/unapplied/server/Avoid-item-merge-if-stack-size-above-max-stack-size.patch
similarity index 100%
rename from patches/server/Avoid-item-merge-if-stack-size-above-max-stack-size.patch
rename to patches/unapplied/server/Avoid-item-merge-if-stack-size-above-max-stack-size.patch
diff --git a/patches/server/Basic-PlayerProfile-API.patch b/patches/unapplied/server/Basic-PlayerProfile-API.patch
similarity index 100%
rename from patches/server/Basic-PlayerProfile-API.patch
rename to patches/unapplied/server/Basic-PlayerProfile-API.patch
diff --git a/patches/server/Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/unapplied/server/Be-a-bit-more-informative-in-maxHealth-exception.patch
similarity index 100%
rename from patches/server/Be-a-bit-more-informative-in-maxHealth-exception.patch
rename to patches/unapplied/server/Be-a-bit-more-informative-in-maxHealth-exception.patch
diff --git a/patches/server/Beacon-API-custom-effect-ranges.patch b/patches/unapplied/server/Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/Beacon-API-custom-effect-ranges.patch
rename to patches/unapplied/server/Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/unapplied/server/Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from patches/server/Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to patches/unapplied/server/Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/Block-Enderpearl-Travel-Exploit.patch b/patches/unapplied/server/Block-Enderpearl-Travel-Exploit.patch
similarity index 100%
rename from patches/server/Block-Enderpearl-Travel-Exploit.patch
rename to patches/unapplied/server/Block-Enderpearl-Travel-Exploit.patch
diff --git a/patches/server/Block-Entity-remove-from-being-called-on-Players.patch b/patches/unapplied/server/Block-Entity-remove-from-being-called-on-Players.patch
similarity index 100%
rename from patches/server/Block-Entity-remove-from-being-called-on-Players.patch
rename to patches/unapplied/server/Block-Entity-remove-from-being-called-on-Players.patch
diff --git a/patches/server/Block-player-logins-during-server-shutdown.patch b/patches/unapplied/server/Block-player-logins-during-server-shutdown.patch
similarity index 100%
rename from patches/server/Block-player-logins-during-server-shutdown.patch
rename to patches/unapplied/server/Block-player-logins-during-server-shutdown.patch
diff --git a/patches/server/BlockDestroyEvent.patch b/patches/unapplied/server/BlockDestroyEvent.patch
similarity index 100%
rename from patches/server/BlockDestroyEvent.patch
rename to patches/unapplied/server/BlockDestroyEvent.patch
diff --git a/patches/server/Book-Size-Limits.patch b/patches/unapplied/server/Book-Size-Limits.patch
similarity index 100%
rename from patches/server/Book-Size-Limits.patch
rename to patches/unapplied/server/Book-Size-Limits.patch
diff --git a/patches/server/Bound-Treasure-Maps-to-World-Border.patch b/patches/unapplied/server/Bound-Treasure-Maps-to-World-Border.patch
similarity index 100%
rename from patches/server/Bound-Treasure-Maps-to-World-Border.patch
rename to patches/unapplied/server/Bound-Treasure-Maps-to-World-Border.patch
diff --git a/patches/server/Brand-support.patch b/patches/unapplied/server/Brand-support.patch
similarity index 100%
rename from patches/server/Brand-support.patch
rename to patches/unapplied/server/Brand-support.patch
diff --git a/patches/server/Break-up-and-make-tab-spam-limits-configurable.patch b/patches/unapplied/server/Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 100%
rename from patches/server/Break-up-and-make-tab-spam-limits-configurable.patch
rename to patches/unapplied/server/Break-up-and-make-tab-spam-limits-configurable.patch
diff --git a/patches/server/Broadcast-join-message-to-console.patch b/patches/unapplied/server/Broadcast-join-message-to-console.patch
similarity index 100%
rename from patches/server/Broadcast-join-message-to-console.patch
rename to patches/unapplied/server/Broadcast-join-message-to-console.patch
diff --git a/patches/server/Buffer-joins-to-world.patch b/patches/unapplied/server/Buffer-joins-to-world.patch
similarity index 100%
rename from patches/server/Buffer-joins-to-world.patch
rename to patches/unapplied/server/Buffer-joins-to-world.patch
diff --git a/patches/server/Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/unapplied/server/Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/unapplied/server/Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/Cache-block-data-strings.patch b/patches/unapplied/server/Cache-block-data-strings.patch
similarity index 100%
rename from patches/server/Cache-block-data-strings.patch
rename to patches/unapplied/server/Cache-block-data-strings.patch
diff --git a/patches/server/Cache-burn-durations.patch b/patches/unapplied/server/Cache-burn-durations.patch
similarity index 100%
rename from patches/server/Cache-burn-durations.patch
rename to patches/unapplied/server/Cache-burn-durations.patch
diff --git a/patches/server/Cache-palette-array.patch b/patches/unapplied/server/Cache-palette-array.patch
similarity index 100%
rename from patches/server/Cache-palette-array.patch
rename to patches/unapplied/server/Cache-palette-array.patch
diff --git a/patches/server/Cache-user-authenticator-threads.patch b/patches/unapplied/server/Cache-user-authenticator-threads.patch
similarity index 100%
rename from patches/server/Cache-user-authenticator-threads.patch
rename to patches/unapplied/server/Cache-user-authenticator-threads.patch
diff --git a/patches/server/Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/unapplied/server/Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 100%
rename from patches/server/Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to patches/unapplied/server/Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/patches/server/Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/unapplied/server/Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 100%
rename from patches/server/Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to patches/unapplied/server/Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/patches/server/Call-onRemove-logic-for-breakNaturally.patch b/patches/unapplied/server/Call-onRemove-logic-for-breakNaturally.patch
similarity index 100%
rename from patches/server/Call-onRemove-logic-for-breakNaturally.patch
rename to patches/unapplied/server/Call-onRemove-logic-for-breakNaturally.patch
diff --git a/patches/server/Call-player-spectator-target-events-and-improve-impl.patch b/patches/unapplied/server/Call-player-spectator-target-events-and-improve-impl.patch
similarity index 100%
rename from patches/server/Call-player-spectator-target-events-and-improve-impl.patch
rename to patches/unapplied/server/Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/patches/server/Cap-Entity-Collisions.patch b/patches/unapplied/server/Cap-Entity-Collisions.patch
similarity index 100%
rename from patches/server/Cap-Entity-Collisions.patch
rename to patches/unapplied/server/Cap-Entity-Collisions.patch
diff --git a/patches/server/Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/unapplied/server/Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 100%
rename from patches/server/Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to patches/unapplied/server/Catch-JsonParseException-in-Entity-and-TE-names.patch
diff --git a/patches/server/Change-EnderEye-target-without-changing-other-things.patch b/patches/unapplied/server/Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/Change-EnderEye-target-without-changing-other-things.patch
rename to patches/unapplied/server/Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/Check-Drowned-for-Villager-Aggression-Config.patch b/patches/unapplied/server/Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 100%
rename from patches/server/Check-Drowned-for-Villager-Aggression-Config.patch
rename to patches/unapplied/server/Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/Check-online-mode-before-converting-and-renaming-pla.patch b/patches/unapplied/server/Check-online-mode-before-converting-and-renaming-pla.patch
similarity index 100%
rename from patches/server/Check-online-mode-before-converting-and-renaming-pla.patch
rename to patches/unapplied/server/Check-online-mode-before-converting-and-renaming-pla.patch
diff --git a/patches/server/Check-requirement-before-suggesting-root-nodes.patch b/patches/unapplied/server/Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/Check-requirement-before-suggesting-root-nodes.patch
rename to patches/unapplied/server/Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/Chunk-Save-Reattempt.patch b/patches/unapplied/server/Chunk-Save-Reattempt.patch
similarity index 100%
rename from patches/server/Chunk-Save-Reattempt.patch
rename to patches/unapplied/server/Chunk-Save-Reattempt.patch
diff --git a/patches/server/Chunk-debug-command.patch b/patches/unapplied/server/Chunk-debug-command.patch
similarity index 100%
rename from patches/server/Chunk-debug-command.patch
rename to patches/unapplied/server/Chunk-debug-command.patch
diff --git a/patches/server/ChunkMapDistance-CME.patch b/patches/unapplied/server/ChunkMapDistance-CME.patch
similarity index 100%
rename from patches/server/ChunkMapDistance-CME.patch
rename to patches/unapplied/server/ChunkMapDistance-CME.patch
diff --git a/patches/server/Clean-up-duplicated-GameProfile-Properties.patch b/patches/unapplied/server/Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from patches/server/Clean-up-duplicated-GameProfile-Properties.patch
rename to patches/unapplied/server/Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/Clear-bucket-NBT-after-dispense.patch b/patches/unapplied/server/Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/Clear-bucket-NBT-after-dispense.patch
rename to patches/unapplied/server/Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/Climbing-should-not-bypass-cramming-gamerule.patch b/patches/unapplied/server/Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 100%
rename from patches/server/Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/unapplied/server/Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/server/Collision-option-for-requiring-a-player-participant.patch b/patches/unapplied/server/Collision-option-for-requiring-a-player-participant.patch
similarity index 100%
rename from patches/server/Collision-option-for-requiring-a-player-participant.patch
rename to patches/unapplied/server/Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/Complete-resource-pack-API.patch b/patches/unapplied/server/Complete-resource-pack-API.patch
similarity index 100%
rename from patches/server/Complete-resource-pack-API.patch
rename to patches/unapplied/server/Complete-resource-pack-API.patch
diff --git a/patches/server/Config-option-for-Piglins-guarding-chests.patch b/patches/unapplied/server/Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/Config-option-for-Piglins-guarding-chests.patch
rename to patches/unapplied/server/Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/unapplied/server/Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 100%
rename from patches/server/Configurable-Alternative-LootPool-Luck-Formula.patch
rename to patches/unapplied/server/Configurable-Alternative-LootPool-Luck-Formula.patch
diff --git a/patches/server/Configurable-Cartographer-Treasure-Maps.patch b/patches/unapplied/server/Configurable-Cartographer-Treasure-Maps.patch
similarity index 100%
rename from patches/server/Configurable-Cartographer-Treasure-Maps.patch
rename to patches/unapplied/server/Configurable-Cartographer-Treasure-Maps.patch
diff --git a/patches/server/Configurable-Chunk-Inhabited-Time.patch b/patches/unapplied/server/Configurable-Chunk-Inhabited-Time.patch
similarity index 100%
rename from patches/server/Configurable-Chunk-Inhabited-Time.patch
rename to patches/unapplied/server/Configurable-Chunk-Inhabited-Time.patch
diff --git a/patches/server/Configurable-Disabling-Cat-Chest-Detection.patch b/patches/unapplied/server/Configurable-Disabling-Cat-Chest-Detection.patch
similarity index 100%
rename from patches/server/Configurable-Disabling-Cat-Chest-Detection.patch
rename to patches/unapplied/server/Configurable-Disabling-Cat-Chest-Detection.patch
diff --git a/patches/server/Configurable-Grass-Spread-Tick-Rate.patch b/patches/unapplied/server/Configurable-Grass-Spread-Tick-Rate.patch
similarity index 100%
rename from patches/server/Configurable-Grass-Spread-Tick-Rate.patch
rename to patches/unapplied/server/Configurable-Grass-Spread-Tick-Rate.patch
diff --git a/patches/server/Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/unapplied/server/Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 100%
rename from patches/server/Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to patches/unapplied/server/Configurable-Keep-Spawn-Loaded-range-per-world.patch
diff --git a/patches/server/Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/unapplied/server/Configurable-Non-Player-Arrow-Despawn-Rate.patch
similarity index 100%
rename from patches/server/Configurable-Non-Player-Arrow-Despawn-Rate.patch
rename to patches/unapplied/server/Configurable-Non-Player-Arrow-Despawn-Rate.patch
diff --git a/patches/server/Configurable-Player-Collision.patch b/patches/unapplied/server/Configurable-Player-Collision.patch
similarity index 100%
rename from patches/server/Configurable-Player-Collision.patch
rename to patches/unapplied/server/Configurable-Player-Collision.patch
diff --git a/patches/server/Configurable-RCON-IP-address.patch b/patches/unapplied/server/Configurable-RCON-IP-address.patch
similarity index 100%
rename from patches/server/Configurable-RCON-IP-address.patch
rename to patches/unapplied/server/Configurable-RCON-IP-address.patch
diff --git a/patches/server/Configurable-baby-zombie-movement-speed.patch b/patches/unapplied/server/Configurable-baby-zombie-movement-speed.patch
similarity index 100%
rename from patches/server/Configurable-baby-zombie-movement-speed.patch
rename to patches/unapplied/server/Configurable-baby-zombie-movement-speed.patch
diff --git a/patches/server/Configurable-cactus-bamboo-and-reed-growth-heights.patch b/patches/unapplied/server/Configurable-cactus-bamboo-and-reed-growth-heights.patch
similarity index 100%
rename from patches/server/Configurable-cactus-bamboo-and-reed-growth-heights.patch
rename to patches/unapplied/server/Configurable-cactus-bamboo-and-reed-growth-heights.patch
diff --git a/patches/server/Configurable-chance-of-villager-zombie-infection.patch b/patches/unapplied/server/Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from patches/server/Configurable-chance-of-villager-zombie-infection.patch
rename to patches/unapplied/server/Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/Configurable-connection-throttle-kick-message.patch b/patches/unapplied/server/Configurable-connection-throttle-kick-message.patch
similarity index 100%
rename from patches/server/Configurable-connection-throttle-kick-message.patch
rename to patches/unapplied/server/Configurable-connection-throttle-kick-message.patch
diff --git a/patches/server/Configurable-container-update-tick-rate.patch b/patches/unapplied/server/Configurable-container-update-tick-rate.patch
similarity index 100%
rename from patches/server/Configurable-container-update-tick-rate.patch
rename to patches/unapplied/server/Configurable-container-update-tick-rate.patch
diff --git a/patches/server/Configurable-door-breaking-difficulty.patch b/patches/unapplied/server/Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/Configurable-door-breaking-difficulty.patch
rename to patches/unapplied/server/Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/Configurable-end-credits.patch b/patches/unapplied/server/Configurable-end-credits.patch
similarity index 100%
rename from patches/server/Configurable-end-credits.patch
rename to patches/unapplied/server/Configurable-end-credits.patch
diff --git a/patches/server/Configurable-feature-seeds.patch b/patches/unapplied/server/Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/Configurable-feature-seeds.patch
rename to patches/unapplied/server/Configurable-feature-seeds.patch
diff --git a/patches/server/Configurable-fishing-time-ranges.patch b/patches/unapplied/server/Configurable-fishing-time-ranges.patch
similarity index 100%
rename from patches/server/Configurable-fishing-time-ranges.patch
rename to patches/unapplied/server/Configurable-fishing-time-ranges.patch
diff --git a/patches/server/Configurable-flying-kick-messages.patch b/patches/unapplied/server/Configurable-flying-kick-messages.patch
similarity index 100%
rename from patches/server/Configurable-flying-kick-messages.patch
rename to patches/unapplied/server/Configurable-flying-kick-messages.patch
diff --git a/patches/server/Configurable-inter-world-teleportation-safety.patch b/patches/unapplied/server/Configurable-inter-world-teleportation-safety.patch
similarity index 100%
rename from patches/server/Configurable-inter-world-teleportation-safety.patch
rename to patches/unapplied/server/Configurable-inter-world-teleportation-safety.patch
diff --git a/patches/server/Configurable-item-frame-map-cursor-update-interval.patch b/patches/unapplied/server/Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/unapplied/server/Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/Configurable-max-leash-distance.patch b/patches/unapplied/server/Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/Configurable-max-leash-distance.patch
rename to patches/unapplied/server/Configurable-max-leash-distance.patch
diff --git a/patches/server/Configurable-mob-spawner-tick-rate.patch b/patches/unapplied/server/Configurable-mob-spawner-tick-rate.patch
similarity index 100%
rename from patches/server/Configurable-mob-spawner-tick-rate.patch
rename to patches/unapplied/server/Configurable-mob-spawner-tick-rate.patch
diff --git a/patches/server/Configurable-packet-in-spam-threshold.patch b/patches/unapplied/server/Configurable-packet-in-spam-threshold.patch
similarity index 100%
rename from patches/server/Configurable-packet-in-spam-threshold.patch
rename to patches/unapplied/server/Configurable-packet-in-spam-threshold.patch
diff --git a/patches/server/Configurable-projectile-relative-velocity.patch b/patches/unapplied/server/Configurable-projectile-relative-velocity.patch
similarity index 100%
rename from patches/server/Configurable-projectile-relative-velocity.patch
rename to patches/unapplied/server/Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/Configurable-spawn-chances-for-skeleton-horses.patch b/patches/unapplied/server/Configurable-spawn-chances-for-skeleton-horses.patch
similarity index 100%
rename from patches/server/Configurable-spawn-chances-for-skeleton-horses.patch
rename to patches/unapplied/server/Configurable-spawn-chances-for-skeleton-horses.patch
diff --git a/patches/server/Configurable-speed-for-water-flowing-over-lava.patch b/patches/unapplied/server/Configurable-speed-for-water-flowing-over-lava.patch
similarity index 100%
rename from patches/server/Configurable-speed-for-water-flowing-over-lava.patch
rename to patches/unapplied/server/Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/Configurable-sprint-interruption-on-attack.patch b/patches/unapplied/server/Configurable-sprint-interruption-on-attack.patch
similarity index 100%
rename from patches/server/Configurable-sprint-interruption-on-attack.patch
rename to patches/unapplied/server/Configurable-sprint-interruption-on-attack.patch
diff --git a/patches/server/Configurable-top-of-nether-void-damage.patch b/patches/unapplied/server/Configurable-top-of-nether-void-damage.patch
similarity index 100%
rename from patches/server/Configurable-top-of-nether-void-damage.patch
rename to patches/unapplied/server/Configurable-top-of-nether-void-damage.patch
diff --git a/patches/server/Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/unapplied/server/Consolidate-flush-calls-for-entity-tracker-packets.patch
similarity index 100%
rename from patches/server/Consolidate-flush-calls-for-entity-tracker-packets.patch
rename to patches/unapplied/server/Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/Convert-legacy-attributes-in-Item-Meta.patch b/patches/unapplied/server/Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/unapplied/server/Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/unapplied/server/Correctly-handle-recursion-for-chunkholder-updates.patch
similarity index 100%
rename from patches/server/Correctly-handle-recursion-for-chunkholder-updates.patch
rename to patches/unapplied/server/Correctly-handle-recursion-for-chunkholder-updates.patch
diff --git a/patches/server/Create-HoverEvent-from-ItemStack-Entity.patch b/patches/unapplied/server/Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/unapplied/server/Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/Custom-replacement-for-eaten-items.patch b/patches/unapplied/server/Custom-replacement-for-eaten-items.patch
similarity index 100%
rename from patches/server/Custom-replacement-for-eaten-items.patch
rename to patches/unapplied/server/Custom-replacement-for-eaten-items.patch
diff --git a/patches/server/Custom-table-implementation-for-blockstate-state-loo.patch b/patches/unapplied/server/Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/unapplied/server/Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/unapplied/server/Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from patches/server/Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to patches/unapplied/server/Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/Default-loading-permissions.yml-before-plugins.patch b/patches/unapplied/server/Default-loading-permissions.yml-before-plugins.patch
similarity index 100%
rename from patches/server/Default-loading-permissions.yml-before-plugins.patch
rename to patches/unapplied/server/Default-loading-permissions.yml-before-plugins.patch
diff --git a/patches/server/Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/unapplied/server/Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 100%
rename from patches/server/Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to patches/unapplied/server/Delay-Chunk-Unloads-based-on-Player-Movement.patch
diff --git a/patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/unapplied/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch
similarity index 100%
rename from patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch
rename to patches/unapplied/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch
diff --git a/patches/server/Detail-more-information-in-watchdog-dumps.patch b/patches/unapplied/server/Detail-more-information-in-watchdog-dumps.patch
similarity index 100%
rename from patches/server/Detail-more-information-in-watchdog-dumps.patch
rename to patches/unapplied/server/Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/Disable-Explicit-Network-Manager-Flushing.patch b/patches/unapplied/server/Disable-Explicit-Network-Manager-Flushing.patch
similarity index 100%
rename from patches/server/Disable-Explicit-Network-Manager-Flushing.patch
rename to patches/unapplied/server/Disable-Explicit-Network-Manager-Flushing.patch
diff --git a/patches/server/Disable-Scoreboards-for-non-players-by-default.patch b/patches/unapplied/server/Disable-Scoreboards-for-non-players-by-default.patch
similarity index 100%
rename from patches/server/Disable-Scoreboards-for-non-players-by-default.patch
rename to patches/unapplied/server/Disable-Scoreboards-for-non-players-by-default.patch
diff --git a/patches/server/Disable-explosion-knockback.patch b/patches/unapplied/server/Disable-explosion-knockback.patch
similarity index 100%
rename from patches/server/Disable-explosion-knockback.patch
rename to patches/unapplied/server/Disable-explosion-knockback.patch
diff --git a/patches/server/Disable-ice-and-snow.patch b/patches/unapplied/server/Disable-ice-and-snow.patch
similarity index 100%
rename from patches/server/Disable-ice-and-snow.patch
rename to patches/unapplied/server/Disable-ice-and-snow.patch
diff --git a/patches/server/Disable-spigot-tick-limiters.patch b/patches/unapplied/server/Disable-spigot-tick-limiters.patch
similarity index 100%
rename from patches/server/Disable-spigot-tick-limiters.patch
rename to patches/unapplied/server/Disable-spigot-tick-limiters.patch
diff --git a/patches/server/Disable-thunder.patch b/patches/unapplied/server/Disable-thunder.patch
similarity index 100%
rename from patches/server/Disable-thunder.patch
rename to patches/unapplied/server/Disable-thunder.patch
diff --git a/patches/server/Distance-manager-tick-timings.patch b/patches/unapplied/server/Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/Distance-manager-tick-timings.patch
rename to patches/unapplied/server/Distance-manager-tick-timings.patch
diff --git a/patches/server/Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/patches/unapplied/server/Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
similarity index 100%
rename from patches/server/Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
rename to patches/unapplied/server/Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
diff --git a/patches/server/Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/unapplied/server/Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from patches/server/Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to patches/unapplied/server/Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/unapplied/server/Do-not-allow-the-server-to-unload-chunks-at-request-.patch
similarity index 100%
rename from patches/server/Do-not-allow-the-server-to-unload-chunks-at-request-.patch
rename to patches/unapplied/server/Do-not-allow-the-server-to-unload-chunks-at-request-.patch
diff --git a/patches/server/Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/unapplied/server/Do-not-allow-ticket-level-changes-when-updating-chun.patch
similarity index 100%
rename from patches/server/Do-not-allow-ticket-level-changes-when-updating-chun.patch
rename to patches/unapplied/server/Do-not-allow-ticket-level-changes-when-updating-chun.patch
diff --git a/patches/server/Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/unapplied/server/Do-not-allow-ticket-level-changes-while-unloading-pl.patch
similarity index 100%
rename from patches/server/Do-not-allow-ticket-level-changes-while-unloading-pl.patch
rename to patches/unapplied/server/Do-not-allow-ticket-level-changes-while-unloading-pl.patch
diff --git a/patches/server/Do-not-copy-visible-chunks.patch b/patches/unapplied/server/Do-not-copy-visible-chunks.patch
similarity index 100%
rename from patches/server/Do-not-copy-visible-chunks.patch
rename to patches/unapplied/server/Do-not-copy-visible-chunks.patch
diff --git a/patches/server/Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/unapplied/server/Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/unapplied/server/Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/Do-not-let-armorstands-drown.patch b/patches/unapplied/server/Do-not-let-armorstands-drown.patch
similarity index 100%
rename from patches/server/Do-not-let-armorstands-drown.patch
rename to patches/unapplied/server/Do-not-let-armorstands-drown.patch
diff --git a/patches/server/Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/unapplied/server/Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/unapplied/server/Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/Do-not-load-chunks-for-Pathfinding.patch b/patches/unapplied/server/Do-not-load-chunks-for-Pathfinding.patch
similarity index 100%
rename from patches/server/Do-not-load-chunks-for-Pathfinding.patch
rename to patches/unapplied/server/Do-not-load-chunks-for-Pathfinding.patch
diff --git a/patches/server/Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch b/patches/unapplied/server/Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
similarity index 100%
rename from patches/server/Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
rename to patches/unapplied/server/Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
diff --git a/patches/server/Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch b/patches/unapplied/server/Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
similarity index 100%
rename from patches/server/Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
rename to patches/unapplied/server/Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
diff --git a/patches/server/Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/unapplied/server/Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 100%
rename from patches/server/Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/unapplied/server/Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/Do-not-run-raytrace-logic-for-AIR.patch b/patches/unapplied/server/Do-not-run-raytrace-logic-for-AIR.patch
similarity index 100%
rename from patches/server/Do-not-run-raytrace-logic-for-AIR.patch
rename to patches/unapplied/server/Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/unapplied/server/Do-not-submit-profile-lookups-to-worldgen-threads.patch
similarity index 100%
rename from patches/server/Do-not-submit-profile-lookups-to-worldgen-threads.patch
rename to patches/unapplied/server/Do-not-submit-profile-lookups-to-worldgen-threads.patch
diff --git a/patches/server/Don-t-allow-digging-into-unloaded-chunks.patch b/patches/unapplied/server/Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 100%
rename from patches/server/Don-t-allow-digging-into-unloaded-chunks.patch
rename to patches/unapplied/server/Don-t-allow-digging-into-unloaded-chunks.patch
diff --git a/patches/server/Don-t-allow-entities-to-ride-themselves-572.patch b/patches/unapplied/server/Don-t-allow-entities-to-ride-themselves-572.patch
similarity index 100%
rename from patches/server/Don-t-allow-entities-to-ride-themselves-572.patch
rename to patches/unapplied/server/Don-t-allow-entities-to-ride-themselves-572.patch
diff --git a/patches/server/Don-t-allow-null-UUID-s-for-chat.patch b/patches/unapplied/server/Don-t-allow-null-UUID-s-for-chat.patch
similarity index 100%
rename from patches/server/Don-t-allow-null-UUID-s-for-chat.patch
rename to patches/unapplied/server/Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/patches/server/Don-t-apply-cramming-damage-to-players.patch b/patches/unapplied/server/Don-t-apply-cramming-damage-to-players.patch
similarity index 100%
rename from patches/server/Don-t-apply-cramming-damage-to-players.patch
rename to patches/unapplied/server/Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/unapplied/server/Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 100%
rename from patches/server/Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to patches/unapplied/server/Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/patches/server/Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/unapplied/server/Don-t-check-ConvertSigns-boolean-every-sign-save.patch
similarity index 100%
rename from patches/server/Don-t-check-ConvertSigns-boolean-every-sign-save.patch
rename to patches/unapplied/server/Don-t-check-ConvertSigns-boolean-every-sign-save.patch
diff --git a/patches/server/Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/unapplied/server/Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from patches/server/Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/unapplied/server/Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/unapplied/server/Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from patches/server/Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/unapplied/server/Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/unapplied/server/Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from patches/server/Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/unapplied/server/Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/unapplied/server/Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/unapplied/server/Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/Don-t-let-fishinghooks-use-portals.patch b/patches/unapplied/server/Don-t-let-fishinghooks-use-portals.patch
similarity index 100%
rename from patches/server/Don-t-let-fishinghooks-use-portals.patch
rename to patches/unapplied/server/Don-t-let-fishinghooks-use-portals.patch
diff --git a/patches/server/Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/unapplied/server/Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from patches/server/Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to patches/unapplied/server/Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/Don-t-log-debug-logging-being-disabled.patch b/patches/unapplied/server/Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/Don-t-log-debug-logging-being-disabled.patch
rename to patches/unapplied/server/Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/Don-t-lookup-fluid-state-when-raytracing.patch b/patches/unapplied/server/Don-t-lookup-fluid-state-when-raytracing.patch
similarity index 100%
rename from patches/server/Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/unapplied/server/Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/unapplied/server/Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
similarity index 100%
rename from patches/server/Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
rename to patches/unapplied/server/Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
diff --git a/patches/server/Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/unapplied/server/Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
similarity index 100%
rename from patches/server/Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
rename to patches/unapplied/server/Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
diff --git a/patches/server/Don-t-move-existing-players-to-world-spawn.patch b/patches/unapplied/server/Don-t-move-existing-players-to-world-spawn.patch
similarity index 100%
rename from patches/server/Don-t-move-existing-players-to-world-spawn.patch
rename to patches/unapplied/server/Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/patches/unapplied/server/Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
similarity index 100%
rename from patches/server/Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
rename to patches/unapplied/server/Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
diff --git a/patches/server/Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/unapplied/server/Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/unapplied/server/Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/Don-t-require-FACING-data.patch b/patches/unapplied/server/Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/Don-t-require-FACING-data.patch
rename to patches/unapplied/server/Don-t-require-FACING-data.patch
diff --git a/patches/server/Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/unapplied/server/Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 100%
rename from patches/server/Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/unapplied/server/Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/Don-t-run-entity-collision-code-if-not-needed.patch b/patches/unapplied/server/Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 100%
rename from patches/server/Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/unapplied/server/Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/unapplied/server/Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
similarity index 100%
rename from patches/server/Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
rename to patches/unapplied/server/Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
diff --git a/patches/server/Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/unapplied/server/Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 100%
rename from patches/server/Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to patches/unapplied/server/Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/Don-t-tick-dead-players.patch b/patches/unapplied/server/Don-t-tick-dead-players.patch
similarity index 100%
rename from patches/server/Don-t-tick-dead-players.patch
rename to patches/unapplied/server/Don-t-tick-dead-players.patch
diff --git a/patches/server/Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch b/patches/unapplied/server/Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
similarity index 100%
rename from patches/server/Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
rename to patches/unapplied/server/Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
diff --git a/patches/server/Dont-send-unnecessary-sign-update.patch b/patches/unapplied/server/Dont-send-unnecessary-sign-update.patch
similarity index 100%
rename from patches/server/Dont-send-unnecessary-sign-update.patch
rename to patches/unapplied/server/Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/Drop-carried-item-when-player-has-disconnected.patch b/patches/unapplied/server/Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/Drop-carried-item-when-player-has-disconnected.patch
rename to patches/unapplied/server/Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/Drop-falling-block-and-tnt-entities-at-the-specified.patch b/patches/unapplied/server/Drop-falling-block-and-tnt-entities-at-the-specified.patch
similarity index 100%
rename from patches/server/Drop-falling-block-and-tnt-entities-at-the-specified.patch
rename to patches/unapplied/server/Drop-falling-block-and-tnt-entities-at-the-specified.patch
diff --git a/patches/server/Duplicate-UUID-Resolve-Option.patch b/patches/unapplied/server/Duplicate-UUID-Resolve-Option.patch
similarity index 100%
rename from patches/server/Duplicate-UUID-Resolve-Option.patch
rename to patches/unapplied/server/Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/Empty-commands-shall-not-be-dispatched.patch b/patches/unapplied/server/Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/Empty-commands-shall-not-be-dispatched.patch
rename to patches/unapplied/server/Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/EnderDragon-Events.patch b/patches/unapplied/server/EnderDragon-Events.patch
similarity index 100%
rename from patches/server/EnderDragon-Events.patch
rename to patches/unapplied/server/EnderDragon-Events.patch
diff --git a/patches/server/Enderman.teleportRandomly.patch b/patches/unapplied/server/Enderman.teleportRandomly.patch
similarity index 100%
rename from patches/server/Enderman.teleportRandomly.patch
rename to patches/unapplied/server/Enderman.teleportRandomly.patch
diff --git a/patches/server/EndermanAttackPlayerEvent.patch b/patches/unapplied/server/EndermanAttackPlayerEvent.patch
similarity index 100%
rename from patches/server/EndermanAttackPlayerEvent.patch
rename to patches/unapplied/server/EndermanAttackPlayerEvent.patch
diff --git a/patches/server/EndermanEscapeEvent.patch b/patches/unapplied/server/EndermanEscapeEvent.patch
similarity index 100%
rename from patches/server/EndermanEscapeEvent.patch
rename to patches/unapplied/server/EndermanEscapeEvent.patch
diff --git a/patches/server/Enforce-Sync-Player-Saves.patch b/patches/unapplied/server/Enforce-Sync-Player-Saves.patch
similarity index 100%
rename from patches/server/Enforce-Sync-Player-Saves.patch
rename to patches/unapplied/server/Enforce-Sync-Player-Saves.patch
diff --git a/patches/server/Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/unapplied/server/Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/unapplied/server/Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/unapplied/server/Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 100%
rename from patches/server/Ensure-Entity-AABB-s-are-never-invalid.patch
rename to patches/unapplied/server/Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/patches/server/Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/unapplied/server/Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from patches/server/Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/unapplied/server/Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/Ensure-commands-are-not-ran-async.patch b/patches/unapplied/server/Ensure-commands-are-not-ran-async.patch
similarity index 100%
rename from patches/server/Ensure-commands-are-not-ran-async.patch
rename to patches/unapplied/server/Ensure-commands-are-not-ran-async.patch
diff --git a/patches/server/Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/unapplied/server/Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 100%
rename from patches/server/Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/unapplied/server/Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/Ensure-inv-drag-is-in-bounds.patch b/patches/unapplied/server/Ensure-inv-drag-is-in-bounds.patch
similarity index 100%
rename from patches/server/Ensure-inv-drag-is-in-bounds.patch
rename to patches/unapplied/server/Ensure-inv-drag-is-in-bounds.patch
diff --git a/patches/server/Ensure-safe-gateway-teleport.patch b/patches/unapplied/server/Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from patches/server/Ensure-safe-gateway-teleport.patch
rename to patches/unapplied/server/Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/Ensure-valid-vehicle-status.patch b/patches/unapplied/server/Ensure-valid-vehicle-status.patch
similarity index 100%
rename from patches/server/Ensure-valid-vehicle-status.patch
rename to patches/unapplied/server/Ensure-valid-vehicle-status.patch
diff --git a/patches/server/Entity-Activation-Range-2.0.patch b/patches/unapplied/server/Entity-Activation-Range-2.0.patch
similarity index 100%
rename from patches/server/Entity-Activation-Range-2.0.patch
rename to patches/unapplied/server/Entity-Activation-Range-2.0.patch
diff --git a/patches/server/Entity-AddTo-RemoveFrom-World-Events.patch b/patches/unapplied/server/Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 100%
rename from patches/server/Entity-AddTo-RemoveFrom-World-Events.patch
rename to patches/unapplied/server/Entity-AddTo-RemoveFrom-World-Events.patch
diff --git a/patches/server/Entity-Jump-API.patch b/patches/unapplied/server/Entity-Jump-API.patch
similarity index 100%
rename from patches/server/Entity-Jump-API.patch
rename to patches/unapplied/server/Entity-Jump-API.patch
diff --git a/patches/server/Entity-Origin-API.patch b/patches/unapplied/server/Entity-Origin-API.patch
similarity index 100%
rename from patches/server/Entity-Origin-API.patch
rename to patches/unapplied/server/Entity-Origin-API.patch
diff --git a/patches/server/Entity-fromMobSpawner.patch b/patches/unapplied/server/Entity-fromMobSpawner.patch
similarity index 100%
rename from patches/server/Entity-fromMobSpawner.patch
rename to patches/unapplied/server/Entity-fromMobSpawner.patch
diff --git a/patches/server/Entity-getEntitySpawnReason.patch b/patches/unapplied/server/Entity-getEntitySpawnReason.patch
similarity index 100%
rename from patches/server/Entity-getEntitySpawnReason.patch
rename to patches/unapplied/server/Entity-getEntitySpawnReason.patch
diff --git a/patches/server/Entity-isTicking.patch b/patches/unapplied/server/Entity-isTicking.patch
similarity index 100%
rename from patches/server/Entity-isTicking.patch
rename to patches/unapplied/server/Entity-isTicking.patch
diff --git a/patches/server/Entity-load-save-limit-per-chunk.patch b/patches/unapplied/server/Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/Entity-load-save-limit-per-chunk.patch
rename to patches/unapplied/server/Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/EntityMoveEvent.patch b/patches/unapplied/server/EntityMoveEvent.patch
similarity index 100%
rename from patches/server/EntityMoveEvent.patch
rename to patches/unapplied/server/EntityMoveEvent.patch
diff --git a/patches/server/EntityPathfindEvent.patch b/patches/unapplied/server/EntityPathfindEvent.patch
similarity index 100%
rename from patches/server/EntityPathfindEvent.patch
rename to patches/unapplied/server/EntityPathfindEvent.patch
diff --git a/patches/server/EntityRegainHealthEvent-isFastRegen-API.patch b/patches/unapplied/server/EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 100%
rename from patches/server/EntityRegainHealthEvent-isFastRegen-API.patch
rename to patches/unapplied/server/EntityRegainHealthEvent-isFastRegen-API.patch
diff --git a/patches/server/Execute-chunk-tasks-mid-tick.patch b/patches/unapplied/server/Execute-chunk-tasks-mid-tick.patch
similarity index 100%
rename from patches/server/Execute-chunk-tasks-mid-tick.patch
rename to patches/unapplied/server/Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/Expand-Explosions-API.patch b/patches/unapplied/server/Expand-Explosions-API.patch
similarity index 100%
rename from patches/server/Expand-Explosions-API.patch
rename to patches/unapplied/server/Expand-Explosions-API.patch
diff --git a/patches/server/Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/unapplied/server/Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 100%
rename from patches/server/Expand-World.spawnParticle-API-and-add-Builder.patch
rename to patches/unapplied/server/Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/patches/server/ExperienceOrbMergeEvent.patch b/patches/unapplied/server/ExperienceOrbMergeEvent.patch
similarity index 100%
rename from patches/server/ExperienceOrbMergeEvent.patch
rename to patches/unapplied/server/ExperienceOrbMergeEvent.patch
diff --git a/patches/server/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/unapplied/server/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 100%
rename from patches/server/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to patches/unapplied/server/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
diff --git a/patches/server/Expose-Arrow-getItemStack.patch b/patches/unapplied/server/Expose-Arrow-getItemStack.patch
similarity index 100%
rename from patches/server/Expose-Arrow-getItemStack.patch
rename to patches/unapplied/server/Expose-Arrow-getItemStack.patch
diff --git a/patches/server/Expose-LivingEntity-hurt-direction.patch b/patches/unapplied/server/Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/Expose-LivingEntity-hurt-direction.patch
rename to patches/unapplied/server/Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/Expose-MinecraftServer-isRunning.patch b/patches/unapplied/server/Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from patches/server/Expose-MinecraftServer-isRunning.patch
rename to patches/unapplied/server/Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/Expose-Tracked-Players.patch b/patches/unapplied/server/Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/Expose-Tracked-Players.patch
rename to patches/unapplied/server/Expose-Tracked-Players.patch
diff --git a/patches/server/Expose-attack-cooldown-methods-for-Player.patch b/patches/unapplied/server/Expose-attack-cooldown-methods-for-Player.patch
similarity index 100%
rename from patches/server/Expose-attack-cooldown-methods-for-Player.patch
rename to patches/unapplied/server/Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/server/Expose-client-protocol-version-and-virtual-host.patch b/patches/unapplied/server/Expose-client-protocol-version-and-virtual-host.patch
similarity index 100%
rename from patches/server/Expose-client-protocol-version-and-virtual-host.patch
rename to patches/unapplied/server/Expose-client-protocol-version-and-virtual-host.patch
diff --git a/patches/server/Expose-game-version.patch b/patches/unapplied/server/Expose-game-version.patch
similarity index 100%
rename from patches/server/Expose-game-version.patch
rename to patches/unapplied/server/Expose-game-version.patch
diff --git a/patches/server/Expose-protocol-version.patch b/patches/unapplied/server/Expose-protocol-version.patch
similarity index 100%
rename from patches/server/Expose-protocol-version.patch
rename to patches/unapplied/server/Expose-protocol-version.patch
diff --git a/patches/server/Expose-server-CommandMap.patch b/patches/unapplied/server/Expose-server-CommandMap.patch
similarity index 100%
rename from patches/server/Expose-server-CommandMap.patch
rename to patches/unapplied/server/Expose-server-CommandMap.patch
diff --git a/patches/server/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/unapplied/server/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/server/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/unapplied/server/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/Expose-the-internal-current-tick.patch b/patches/unapplied/server/Expose-the-internal-current-tick.patch
similarity index 100%
rename from patches/server/Expose-the-internal-current-tick.patch
rename to patches/unapplied/server/Expose-the-internal-current-tick.patch
diff --git a/patches/server/Expose-world-spawn-angle.patch b/patches/unapplied/server/Expose-world-spawn-angle.patch
similarity index 100%
rename from patches/server/Expose-world-spawn-angle.patch
rename to patches/unapplied/server/Expose-world-spawn-angle.patch
diff --git a/patches/server/Extend-Player-Interact-cancellation.patch b/patches/unapplied/server/Extend-Player-Interact-cancellation.patch
similarity index 100%
rename from patches/server/Extend-Player-Interact-cancellation.patch
rename to patches/unapplied/server/Extend-Player-Interact-cancellation.patch
diff --git a/patches/server/Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/unapplied/server/Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from patches/server/Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/unapplied/server/Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/Faster-redstone-torch-rapid-clock-removal.patch b/patches/unapplied/server/Faster-redstone-torch-rapid-clock-removal.patch
similarity index 100%
rename from patches/server/Faster-redstone-torch-rapid-clock-removal.patch
rename to patches/unapplied/server/Faster-redstone-torch-rapid-clock-removal.patch
diff --git a/patches/server/Fill-Profile-Property-Events.patch b/patches/unapplied/server/Fill-Profile-Property-Events.patch
similarity index 100%
rename from patches/server/Fill-Profile-Property-Events.patch
rename to patches/unapplied/server/Fill-Profile-Property-Events.patch
diff --git a/patches/server/Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/patches/unapplied/server/Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
similarity index 100%
rename from patches/server/Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
rename to patches/unapplied/server/Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
diff --git a/patches/server/Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/patches/unapplied/server/Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
similarity index 100%
rename from patches/server/Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
rename to patches/unapplied/server/Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
diff --git a/patches/server/Fire-event-on-GS4-query.patch b/patches/unapplied/server/Fire-event-on-GS4-query.patch
similarity index 100%
rename from patches/server/Fire-event-on-GS4-query.patch
rename to patches/unapplied/server/Fire-event-on-GS4-query.patch
diff --git a/patches/server/Firework-API-s.patch b/patches/unapplied/server/Firework-API-s.patch
similarity index 100%
rename from patches/server/Firework-API-s.patch
rename to patches/unapplied/server/Firework-API-s.patch
diff --git a/patches/server/Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/unapplied/server/Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/unapplied/server/Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/patches/unapplied/server/Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
similarity index 100%
rename from patches/server/Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
rename to patches/unapplied/server/Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
diff --git a/patches/server/Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/unapplied/server/Fix-Bukkit-NamespacedKey-shenanigans.patch
similarity index 100%
rename from patches/server/Fix-Bukkit-NamespacedKey-shenanigans.patch
rename to patches/unapplied/server/Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/unapplied/server/Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 100%
rename from patches/server/Fix-CB-call-to-changed-postToMainThread-method.patch
rename to patches/unapplied/server/Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/patches/server/Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/unapplied/server/Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
similarity index 100%
rename from patches/server/Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
rename to patches/unapplied/server/Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
diff --git a/patches/server/Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/unapplied/server/Fix-Chunk-Post-Processing-deadlock-risk.patch
similarity index 100%
rename from patches/server/Fix-Chunk-Post-Processing-deadlock-risk.patch
rename to patches/unapplied/server/Fix-Chunk-Post-Processing-deadlock-risk.patch
diff --git a/patches/server/Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/unapplied/server/Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/unapplied/server/Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/Fix-Codec-log-spam.patch b/patches/unapplied/server/Fix-Codec-log-spam.patch
similarity index 100%
rename from patches/server/Fix-Codec-log-spam.patch
rename to patches/unapplied/server/Fix-Codec-log-spam.patch
diff --git a/patches/server/Fix-Concurrency-issue-in-WeightedList.patch b/patches/unapplied/server/Fix-Concurrency-issue-in-WeightedList.patch
similarity index 100%
rename from patches/server/Fix-Concurrency-issue-in-WeightedList.patch
rename to patches/unapplied/server/Fix-Concurrency-issue-in-WeightedList.patch
diff --git a/patches/server/Fix-CraftCriteria-defaults-map.patch b/patches/unapplied/server/Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/Fix-CraftCriteria-defaults-map.patch
rename to patches/unapplied/server/Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/Fix-CraftEntity-hashCode.patch b/patches/unapplied/server/Fix-CraftEntity-hashCode.patch
similarity index 100%
rename from patches/server/Fix-CraftEntity-hashCode.patch
rename to patches/unapplied/server/Fix-CraftEntity-hashCode.patch
diff --git a/patches/server/Fix-CraftPotionBrewer-cache.patch b/patches/unapplied/server/Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/Fix-CraftPotionBrewer-cache.patch
rename to patches/unapplied/server/Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/unapplied/server/Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/unapplied/server/Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/patches/unapplied/server/Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
similarity index 100%
rename from patches/server/Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
rename to patches/unapplied/server/Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
diff --git a/patches/server/Fix-CraftSound-backwards-compatibility.patch b/patches/unapplied/server/Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/Fix-CraftSound-backwards-compatibility.patch
rename to patches/unapplied/server/Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/Fix-CraftTeam-null-check.patch b/patches/unapplied/server/Fix-CraftTeam-null-check.patch
similarity index 100%
rename from patches/server/Fix-CraftTeam-null-check.patch
rename to patches/unapplied/server/Fix-CraftTeam-null-check.patch
diff --git a/patches/server/Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/unapplied/server/Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
similarity index 100%
rename from patches/server/Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
rename to patches/unapplied/server/Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
diff --git a/patches/server/Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/unapplied/server/Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 100%
rename from patches/server/Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/unapplied/server/Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/Fix-Light-Command.patch b/patches/unapplied/server/Fix-Light-Command.patch
similarity index 100%
rename from patches/server/Fix-Light-Command.patch
rename to patches/unapplied/server/Fix-Light-Command.patch
diff --git a/patches/server/Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/unapplied/server/Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 100%
rename from patches/server/Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to patches/unapplied/server/Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
diff --git a/patches/server/Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/unapplied/server/Fix-MC-117075-TE-Unload-Lag-Spike.patch
similarity index 100%
rename from patches/server/Fix-MC-117075-TE-Unload-Lag-Spike.patch
rename to patches/unapplied/server/Fix-MC-117075-TE-Unload-Lag-Spike.patch
diff --git a/patches/server/Fix-MC-158900.patch b/patches/unapplied/server/Fix-MC-158900.patch
similarity index 100%
rename from patches/server/Fix-MC-158900.patch
rename to patches/unapplied/server/Fix-MC-158900.patch
diff --git a/patches/server/Fix-MC-161754.patch b/patches/unapplied/server/Fix-MC-161754.patch
similarity index 100%
rename from patches/server/Fix-MC-161754.patch
rename to patches/unapplied/server/Fix-MC-161754.patch
diff --git a/patches/server/Fix-MC-187716-Use-configured-height.patch b/patches/unapplied/server/Fix-MC-187716-Use-configured-height.patch
similarity index 100%
rename from patches/server/Fix-MC-187716-Use-configured-height.patch
rename to patches/unapplied/server/Fix-MC-187716-Use-configured-height.patch
diff --git a/patches/server/Fix-MerchantOffer-BuyB-Only-AssertionError.patch b/patches/unapplied/server/Fix-MerchantOffer-BuyB-Only-AssertionError.patch
similarity index 100%
rename from patches/server/Fix-MerchantOffer-BuyB-Only-AssertionError.patch
rename to patches/unapplied/server/Fix-MerchantOffer-BuyB-Only-AssertionError.patch
diff --git a/patches/server/Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch b/patches/unapplied/server/Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
similarity index 100%
rename from patches/server/Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
rename to patches/unapplied/server/Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
diff --git a/patches/server/Fix-Not-a-string-Map-Conversion-spam.patch b/patches/unapplied/server/Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/unapplied/server/Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/Fix-Old-Sign-Conversion.patch b/patches/unapplied/server/Fix-Old-Sign-Conversion.patch
similarity index 100%
rename from patches/server/Fix-Old-Sign-Conversion.patch
rename to patches/unapplied/server/Fix-Old-Sign-Conversion.patch
diff --git a/patches/server/Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/unapplied/server/Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 100%
rename from patches/server/Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/unapplied/server/Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/patches/server/Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/unapplied/server/Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/unapplied/server/Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/unapplied/server/Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/unapplied/server/Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/unapplied/server/Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 100%
rename from patches/server/Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/unapplied/server/Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/unapplied/server/Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/unapplied/server/Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/Fix-PotionEffect-ignores-icon-flag.patch b/patches/unapplied/server/Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from patches/server/Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/unapplied/server/Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/unapplied/server/Fix-PotionSplashEvent-for-water-splash-potions.patch
similarity index 100%
rename from patches/server/Fix-PotionSplashEvent-for-water-splash-potions.patch
rename to patches/unapplied/server/Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/unapplied/server/Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/unapplied/server/Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/unapplied/server/Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/unapplied/server/Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/Fix-SPIGOT-5989.patch b/patches/unapplied/server/Fix-SPIGOT-5989.patch
similarity index 100%
rename from patches/server/Fix-SPIGOT-5989.patch
rename to patches/unapplied/server/Fix-SPIGOT-5989.patch
diff --git a/patches/server/Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/unapplied/server/Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 100%
rename from patches/server/Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/unapplied/server/Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/Fix-SpongeAbsortEvent-handling.patch b/patches/unapplied/server/Fix-SpongeAbsortEvent-handling.patch
similarity index 100%
rename from patches/server/Fix-SpongeAbsortEvent-handling.patch
rename to patches/unapplied/server/Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/Fix-World-isChunkGenerated-calls.patch b/patches/unapplied/server/Fix-World-isChunkGenerated-calls.patch
similarity index 100%
rename from patches/server/Fix-World-isChunkGenerated-calls.patch
rename to patches/unapplied/server/Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/unapplied/server/Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/server/Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/unapplied/server/Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/Fix-and-optimise-world-force-upgrading.patch b/patches/unapplied/server/Fix-and-optimise-world-force-upgrading.patch
similarity index 100%
rename from patches/server/Fix-and-optimise-world-force-upgrading.patch
rename to patches/unapplied/server/Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/Fix-and-optimize-legacy-world-conversion.patch b/patches/unapplied/server/Fix-and-optimize-legacy-world-conversion.patch
similarity index 100%
rename from patches/server/Fix-and-optimize-legacy-world-conversion.patch
rename to patches/unapplied/server/Fix-and-optimize-legacy-world-conversion.patch
diff --git a/patches/server/Fix-anvil-prepare-event-not-working-with-zero-xp.patch b/patches/unapplied/server/Fix-anvil-prepare-event-not-working-with-zero-xp.patch
similarity index 100%
rename from patches/server/Fix-anvil-prepare-event-not-working-with-zero-xp.patch
rename to patches/unapplied/server/Fix-anvil-prepare-event-not-working-with-zero-xp.patch
diff --git a/patches/server/Fix-arrows-never-despawning-MC-125757.patch b/patches/unapplied/server/Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/Fix-arrows-never-despawning-MC-125757.patch
rename to patches/unapplied/server/Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/Fix-block-drops-position-losing-precision-millions-o.patch b/patches/unapplied/server/Fix-block-drops-position-losing-precision-millions-o.patch
similarity index 100%
rename from patches/server/Fix-block-drops-position-losing-precision-millions-o.patch
rename to patches/unapplied/server/Fix-block-drops-position-losing-precision-millions-o.patch
diff --git a/patches/server/Fix-checkReach-check-for-Shulker-boxes.patch b/patches/unapplied/server/Fix-checkReach-check-for-Shulker-boxes.patch
similarity index 100%
rename from patches/server/Fix-checkReach-check-for-Shulker-boxes.patch
rename to patches/unapplied/server/Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/unapplied/server/Fix-chunks-refusing-to-unload-at-low-TPS.patch
similarity index 100%
rename from patches/server/Fix-chunks-refusing-to-unload-at-low-TPS.patch
rename to patches/unapplied/server/Fix-chunks-refusing-to-unload-at-low-TPS.patch
diff --git a/patches/server/Fix-client-lag-on-advancement-loading.patch b/patches/unapplied/server/Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/Fix-client-lag-on-advancement-loading.patch
rename to patches/unapplied/server/Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/Fix-client-rendering-skulls-from-same-user.patch b/patches/unapplied/server/Fix-client-rendering-skulls-from-same-user.patch
similarity index 100%
rename from patches/server/Fix-client-rendering-skulls-from-same-user.patch
rename to patches/unapplied/server/Fix-client-rendering-skulls-from-same-user.patch
diff --git a/patches/server/Fix-commands-from-signs-not-firing-command-events.patch b/patches/unapplied/server/Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/unapplied/server/Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/Fix-curing-zombie-villager-discount-exploit.patch b/patches/unapplied/server/Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/server/Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/unapplied/server/Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/Fix-dangerous-end-portal-logic.patch b/patches/unapplied/server/Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/Fix-dangerous-end-portal-logic.patch
rename to patches/unapplied/server/Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/unapplied/server/Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/server/Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/unapplied/server/Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/unapplied/server/Fix-duplicating-give-items-on-item-drop-cancel.patch
similarity index 100%
rename from patches/server/Fix-duplicating-give-items-on-item-drop-cancel.patch
rename to patches/unapplied/server/Fix-duplicating-give-items-on-item-drop-cancel.patch
diff --git a/patches/server/Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/unapplied/server/Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 100%
rename from patches/server/Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to patches/unapplied/server/Fix-exploit-that-allowed-colored-signs-to-be-created.patch
diff --git a/patches/server/Fix-for-large-move-vectors-crashing-server.patch b/patches/unapplied/server/Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from patches/server/Fix-for-large-move-vectors-crashing-server.patch
rename to patches/unapplied/server/Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/Fix-harming-potion-dupe.patch b/patches/unapplied/server/Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/Fix-harming-potion-dupe.patch
rename to patches/unapplied/server/Fix-harming-potion-dupe.patch
diff --git a/patches/server/Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/unapplied/server/Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/server/Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/unapplied/server/Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/Fix-incorrect-message-for-outdated-client.patch b/patches/unapplied/server/Fix-incorrect-message-for-outdated-client.patch
similarity index 100%
rename from patches/server/Fix-incorrect-message-for-outdated-client.patch
rename to patches/unapplied/server/Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch b/patches/unapplied/server/Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
similarity index 100%
rename from patches/server/Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
rename to patches/unapplied/server/Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
diff --git a/patches/server/Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/unapplied/server/Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/unapplied/server/Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/Fix-interact-event-not-being-called-in-adventure.patch b/patches/unapplied/server/Fix-interact-event-not-being-called-in-adventure.patch
similarity index 100%
rename from patches/server/Fix-interact-event-not-being-called-in-adventure.patch
rename to patches/unapplied/server/Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/patches/server/Fix-invulnerable-end-crystals.patch b/patches/unapplied/server/Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/Fix-invulnerable-end-crystals.patch
rename to patches/unapplied/server/Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/Fix-issues-with-mob-conversion.patch b/patches/unapplied/server/Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/Fix-issues-with-mob-conversion.patch
rename to patches/unapplied/server/Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/Fix-item-locations-dropped-from-campfires.patch b/patches/unapplied/server/Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/Fix-item-locations-dropped-from-campfires.patch
rename to patches/unapplied/server/Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/Fix-items-not-falling-correctly.patch b/patches/unapplied/server/Fix-items-not-falling-correctly.patch
similarity index 100%
rename from patches/server/Fix-items-not-falling-correctly.patch
rename to patches/unapplied/server/Fix-items-not-falling-correctly.patch
diff --git a/patches/server/Fix-items-vanishing-through-end-portal.patch b/patches/unapplied/server/Fix-items-vanishing-through-end-portal.patch
similarity index 100%
rename from patches/server/Fix-items-vanishing-through-end-portal.patch
rename to patches/unapplied/server/Fix-items-vanishing-through-end-portal.patch
diff --git a/patches/server/Fix-lag-from-explosions-processing-dead-entities.patch b/patches/unapplied/server/Fix-lag-from-explosions-processing-dead-entities.patch
similarity index 100%
rename from patches/server/Fix-lag-from-explosions-processing-dead-entities.patch
rename to patches/unapplied/server/Fix-lag-from-explosions-processing-dead-entities.patch
diff --git a/patches/server/Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/unapplied/server/Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 100%
rename from patches/server/Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to patches/unapplied/server/Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/unapplied/server/Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 100%
rename from patches/server/Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/unapplied/server/Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/Fix-missing-chunks-due-to-integer-overflow.patch b/patches/unapplied/server/Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/unapplied/server/Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/Fix-nerfed-slime-when-splitting.patch b/patches/unapplied/server/Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/Fix-nerfed-slime-when-splitting.patch
rename to patches/unapplied/server/Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/unapplied/server/Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 100%
rename from patches/server/Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to patches/unapplied/server/Fix-numerous-item-duplication-issues-and-teleport-is.patch
diff --git a/patches/server/Fix-piston-physics-inconsistency-MC-188840.patch b/patches/unapplied/server/Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from patches/server/Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/unapplied/server/Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/unapplied/server/Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/unapplied/server/Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/unapplied/server/Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/unapplied/server/Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/Fix-sand-duping.patch b/patches/unapplied/server/Fix-sand-duping.patch
similarity index 100%
rename from patches/server/Fix-sand-duping.patch
rename to patches/unapplied/server/Fix-sand-duping.patch
diff --git a/patches/server/Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/unapplied/server/Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/unapplied/server/Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/Fix-some-rails-connecting-improperly.patch b/patches/unapplied/server/Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/Fix-some-rails-connecting-improperly.patch
rename to patches/unapplied/server/Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/unapplied/server/Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from patches/server/Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to patches/unapplied/server/Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/patches/unapplied/server/Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
similarity index 100%
rename from patches/server/Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
rename to patches/unapplied/server/Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
diff --git a/patches/server/Fix-test-not-bootstrapping.patch b/patches/unapplied/server/Fix-test-not-bootstrapping.patch
similarity index 100%
rename from patches/server/Fix-test-not-bootstrapping.patch
rename to patches/unapplied/server/Fix-test-not-bootstrapping.patch
diff --git a/patches/server/Fix-this-stupid-bullshit.patch b/patches/unapplied/server/Fix-this-stupid-bullshit.patch
similarity index 100%
rename from patches/server/Fix-this-stupid-bullshit.patch
rename to patches/unapplied/server/Fix-this-stupid-bullshit.patch
diff --git a/patches/server/Fix-upstreams-block-state-factories.patch b/patches/unapplied/server/Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/Fix-upstreams-block-state-factories.patch
rename to patches/unapplied/server/Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/Fix-villager-boat-exploit.patch b/patches/unapplied/server/Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/Fix-villager-boat-exploit.patch
rename to patches/unapplied/server/Fix-villager-boat-exploit.patch
diff --git a/patches/server/Fix-villager-trading-demand-MC-163962.patch b/patches/unapplied/server/Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/Fix-villager-trading-demand-MC-163962.patch
rename to patches/unapplied/server/Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/Fixed-TileEntityBell-memory-leak.patch b/patches/unapplied/server/Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/Fixed-TileEntityBell-memory-leak.patch
rename to patches/unapplied/server/Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/Fixes-kick-event-leave-message-not-being-sent.patch b/patches/unapplied/server/Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 100%
rename from patches/server/Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/unapplied/server/Fixes-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/Flag-to-disable-the-channel-limit.patch b/patches/unapplied/server/Flag-to-disable-the-channel-limit.patch
similarity index 100%
rename from patches/server/Flag-to-disable-the-channel-limit.patch
rename to patches/unapplied/server/Flag-to-disable-the-channel-limit.patch
diff --git a/patches/server/Further-improve-server-tick-loop.patch b/patches/unapplied/server/Further-improve-server-tick-loop.patch
similarity index 100%
rename from patches/server/Further-improve-server-tick-loop.patch
rename to patches/unapplied/server/Further-improve-server-tick-loop.patch
diff --git a/patches/server/Generator-Settings.patch b/patches/unapplied/server/Generator-Settings.patch
similarity index 100%
rename from patches/server/Generator-Settings.patch
rename to patches/unapplied/server/Generator-Settings.patch
diff --git a/patches/server/Get-entity-default-attributes.patch b/patches/unapplied/server/Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/Get-entity-default-attributes.patch
rename to patches/unapplied/server/Get-entity-default-attributes.patch
diff --git a/patches/server/Goat-ram-API.patch b/patches/unapplied/server/Goat-ram-API.patch
similarity index 100%
rename from patches/server/Goat-ram-API.patch
rename to patches/unapplied/server/Goat-ram-API.patch
diff --git a/patches/server/Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/unapplied/server/Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from patches/server/Guard-against-serializing-mismatching-chunk-coordina.patch
rename to patches/unapplied/server/Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/Guardian-beam-workaround.patch b/patches/unapplied/server/Guardian-beam-workaround.patch
similarity index 100%
rename from patches/server/Guardian-beam-workaround.patch
rename to patches/unapplied/server/Guardian-beam-workaround.patch
diff --git a/patches/server/Handle-Item-Meta-Inconsistencies.patch b/patches/unapplied/server/Handle-Item-Meta-Inconsistencies.patch
similarity index 100%
rename from patches/server/Handle-Item-Meta-Inconsistencies.patch
rename to patches/unapplied/server/Handle-Item-Meta-Inconsistencies.patch
diff --git a/patches/server/Handle-Large-Packets-disconnecting-client.patch b/patches/unapplied/server/Handle-Large-Packets-disconnecting-client.patch
similarity index 100%
rename from patches/server/Handle-Large-Packets-disconnecting-client.patch
rename to patches/unapplied/server/Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/unapplied/server/Handle-Oversized-Tile-Entities-in-chunks.patch
similarity index 100%
rename from patches/server/Handle-Oversized-Tile-Entities-in-chunks.patch
rename to patches/unapplied/server/Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/patches/server/Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/unapplied/server/Handle-plugin-prefixes-using-Log4J-configuration.patch
similarity index 100%
rename from patches/server/Handle-plugin-prefixes-using-Log4J-configuration.patch
rename to patches/unapplied/server/Handle-plugin-prefixes-using-Log4J-configuration.patch
diff --git a/patches/server/Here-s-Johnny.patch b/patches/unapplied/server/Here-s-Johnny.patch
similarity index 100%
rename from patches/server/Here-s-Johnny.patch
rename to patches/unapplied/server/Here-s-Johnny.patch
diff --git a/patches/server/Hide-sync-chunk-writes-behind-flag.patch b/patches/unapplied/server/Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/Hide-sync-chunk-writes-behind-flag.patch
rename to patches/unapplied/server/Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/unapplied/server/Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
similarity index 100%
rename from patches/server/Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
rename to patches/unapplied/server/Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
diff --git a/patches/server/Honor-EntityAgeable.ageLock.patch b/patches/unapplied/server/Honor-EntityAgeable.ageLock.patch
similarity index 100%
rename from patches/server/Honor-EntityAgeable.ageLock.patch
rename to patches/unapplied/server/Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/Hook-into-CB-plugin-rewrites.patch b/patches/unapplied/server/Hook-into-CB-plugin-rewrites.patch
similarity index 100%
rename from patches/server/Hook-into-CB-plugin-rewrites.patch
rename to patches/unapplied/server/Hook-into-CB-plugin-rewrites.patch
diff --git a/patches/server/Implement-API-to-expose-exact-interaction-point.patch b/patches/unapplied/server/Implement-API-to-expose-exact-interaction-point.patch
similarity index 100%
rename from patches/server/Implement-API-to-expose-exact-interaction-point.patch
rename to patches/unapplied/server/Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/unapplied/server/Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/unapplied/server/Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/Implement-BlockPreDispenseEvent.patch b/patches/unapplied/server/Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/Implement-BlockPreDispenseEvent.patch
rename to patches/unapplied/server/Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/Implement-Brigadier-Mojang-API.patch b/patches/unapplied/server/Implement-Brigadier-Mojang-API.patch
similarity index 100%
rename from patches/server/Implement-Brigadier-Mojang-API.patch
rename to patches/unapplied/server/Implement-Brigadier-Mojang-API.patch
diff --git a/patches/server/Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/unapplied/server/Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
similarity index 100%
rename from patches/server/Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
rename to patches/unapplied/server/Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
diff --git a/patches/server/Implement-CraftBlockSoundGroup.patch b/patches/unapplied/server/Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from patches/server/Implement-CraftBlockSoundGroup.patch
rename to patches/unapplied/server/Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/Implement-EntityKnockbackByEntityEvent.patch b/patches/unapplied/server/Implement-EntityKnockbackByEntityEvent.patch
similarity index 100%
rename from patches/server/Implement-EntityKnockbackByEntityEvent.patch
rename to patches/unapplied/server/Implement-EntityKnockbackByEntityEvent.patch
diff --git a/patches/server/Implement-EntityTeleportEndGatewayEvent.patch b/patches/unapplied/server/Implement-EntityTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/server/Implement-EntityTeleportEndGatewayEvent.patch
rename to patches/unapplied/server/Implement-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/server/Implement-Expanded-ArmorStand-API.patch b/patches/unapplied/server/Implement-Expanded-ArmorStand-API.patch
similarity index 100%
rename from patches/server/Implement-Expanded-ArmorStand-API.patch
rename to patches/unapplied/server/Implement-Expanded-ArmorStand-API.patch
diff --git a/patches/server/Implement-Keyed-on-World.patch b/patches/unapplied/server/Implement-Keyed-on-World.patch
similarity index 100%
rename from patches/server/Implement-Keyed-on-World.patch
rename to patches/unapplied/server/Implement-Keyed-on-World.patch
diff --git a/patches/server/Implement-Mob-Goal-API.patch b/patches/unapplied/server/Implement-Mob-Goal-API.patch
similarity index 100%
rename from patches/server/Implement-Mob-Goal-API.patch
rename to patches/unapplied/server/Implement-Mob-Goal-API.patch
diff --git a/patches/server/Implement-Paper-VersionChecker.patch b/patches/unapplied/server/Implement-Paper-VersionChecker.patch
similarity index 100%
rename from patches/server/Implement-Paper-VersionChecker.patch
rename to patches/unapplied/server/Implement-Paper-VersionChecker.patch
diff --git a/patches/server/Implement-Player-Client-Options-API.patch b/patches/unapplied/server/Implement-Player-Client-Options-API.patch
similarity index 100%
rename from patches/server/Implement-Player-Client-Options-API.patch
rename to patches/unapplied/server/Implement-Player-Client-Options-API.patch
diff --git a/patches/server/Implement-PlayerFlowerPotManipulateEvent.patch b/patches/unapplied/server/Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/unapplied/server/Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/Implement-PlayerLocaleChangeEvent.patch b/patches/unapplied/server/Implement-PlayerLocaleChangeEvent.patch
similarity index 100%
rename from patches/server/Implement-PlayerLocaleChangeEvent.patch
rename to patches/unapplied/server/Implement-PlayerLocaleChangeEvent.patch
diff --git a/patches/server/Implement-PlayerPostRespawnEvent.patch b/patches/unapplied/server/Implement-PlayerPostRespawnEvent.patch
similarity index 100%
rename from patches/server/Implement-PlayerPostRespawnEvent.patch
rename to patches/unapplied/server/Implement-PlayerPostRespawnEvent.patch
diff --git a/patches/server/Implement-TargetHitEvent.patch b/patches/unapplied/server/Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/Implement-TargetHitEvent.patch
rename to patches/unapplied/server/Implement-TargetHitEvent.patch
diff --git a/patches/server/Implement-World.getEntity-UUID-API.patch b/patches/unapplied/server/Implement-World.getEntity-UUID-API.patch
similarity index 100%
rename from patches/server/Implement-World.getEntity-UUID-API.patch
rename to patches/unapplied/server/Implement-World.getEntity-UUID-API.patch
diff --git a/patches/server/Implement-alternative-item-despawn-rate.patch b/patches/unapplied/server/Implement-alternative-item-despawn-rate.patch
similarity index 100%
rename from patches/server/Implement-alternative-item-despawn-rate.patch
rename to patches/unapplied/server/Implement-alternative-item-despawn-rate.patch
diff --git a/patches/server/Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/unapplied/server/Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 100%
rename from patches/server/Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to patches/unapplied/server/Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
diff --git a/patches/server/Implement-ensureServerConversions-API.patch b/patches/unapplied/server/Implement-ensureServerConversions-API.patch
similarity index 100%
rename from patches/server/Implement-ensureServerConversions-API.patch
rename to patches/unapplied/server/Implement-ensureServerConversions-API.patch
diff --git a/patches/server/Implement-extended-PaperServerListPingEvent.patch b/patches/unapplied/server/Implement-extended-PaperServerListPingEvent.patch
similarity index 100%
rename from patches/server/Implement-extended-PaperServerListPingEvent.patch
rename to patches/unapplied/server/Implement-extended-PaperServerListPingEvent.patch
diff --git a/patches/server/Implement-furnace-cook-speed-multiplier-API.patch b/patches/unapplied/server/Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from patches/server/Implement-furnace-cook-speed-multiplier-API.patch
rename to patches/unapplied/server/Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/Implement-getI18NDisplayName.patch b/patches/unapplied/server/Implement-getI18NDisplayName.patch
similarity index 100%
rename from patches/server/Implement-getI18NDisplayName.patch
rename to patches/unapplied/server/Implement-getI18NDisplayName.patch
diff --git a/patches/server/Implement-methods-to-convert-between-Component-and-B.patch b/patches/unapplied/server/Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/unapplied/server/Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/Implemented-BlockFailedDispenseEvent.patch b/patches/unapplied/server/Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/Implemented-BlockFailedDispenseEvent.patch
rename to patches/unapplied/server/Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/Improve-BlockPosition-inlining.patch b/patches/unapplied/server/Improve-BlockPosition-inlining.patch
similarity index 100%
rename from patches/server/Improve-BlockPosition-inlining.patch
rename to patches/unapplied/server/Improve-BlockPosition-inlining.patch
diff --git a/patches/server/Improve-Chunk-Status-Transition-Speed.patch b/patches/unapplied/server/Improve-Chunk-Status-Transition-Speed.patch
similarity index 100%
rename from patches/server/Improve-Chunk-Status-Transition-Speed.patch
rename to patches/unapplied/server/Improve-Chunk-Status-Transition-Speed.patch
diff --git a/patches/server/Improve-EntityShootBowEvent.patch b/patches/unapplied/server/Improve-EntityShootBowEvent.patch
similarity index 100%
rename from patches/server/Improve-EntityShootBowEvent.patch
rename to patches/unapplied/server/Improve-EntityShootBowEvent.patch
diff --git a/patches/server/Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/unapplied/server/Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
similarity index 100%
rename from patches/server/Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
rename to patches/unapplied/server/Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/patches/server/Improve-Legacy-Component-serialization-size.patch b/patches/unapplied/server/Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/Improve-Legacy-Component-serialization-size.patch
rename to patches/unapplied/server/Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/unapplied/server/Improve-Log4J-Configuration-Plugin-Loggers.patch
similarity index 100%
rename from patches/server/Improve-Log4J-Configuration-Plugin-Loggers.patch
rename to patches/unapplied/server/Improve-Log4J-Configuration-Plugin-Loggers.patch
diff --git a/patches/server/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/unapplied/server/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 100%
rename from patches/server/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to patches/unapplied/server/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/unapplied/server/Improve-Server-Thread-Pool-and-Thread-Priorities.patch
similarity index 100%
rename from patches/server/Improve-Server-Thread-Pool-and-Thread-Priorities.patch
rename to patches/unapplied/server/Improve-Server-Thread-Pool-and-Thread-Priorities.patch
diff --git a/patches/server/Improve-ServerGUI.patch b/patches/unapplied/server/Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/Improve-ServerGUI.patch
rename to patches/unapplied/server/Improve-ServerGUI.patch
diff --git a/patches/server/Improve-boat-collision-performance.patch b/patches/unapplied/server/Improve-boat-collision-performance.patch
similarity index 100%
rename from patches/server/Improve-boat-collision-performance.patch
rename to patches/unapplied/server/Improve-boat-collision-performance.patch
diff --git a/patches/server/Improve-death-events.patch b/patches/unapplied/server/Improve-death-events.patch
similarity index 100%
rename from patches/server/Improve-death-events.patch
rename to patches/unapplied/server/Improve-death-events.patch
diff --git a/patches/server/Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/unapplied/server/Improve-inlinig-for-some-hot-IBlockData-methods.patch
similarity index 100%
rename from patches/server/Improve-inlinig-for-some-hot-IBlockData-methods.patch
rename to patches/unapplied/server/Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/patches/server/Improve-the-Saddle-API-for-Horses.patch b/patches/unapplied/server/Improve-the-Saddle-API-for-Horses.patch
similarity index 100%
rename from patches/server/Improve-the-Saddle-API-for-Horses.patch
rename to patches/unapplied/server/Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/server/Improved-Async-Task-Scheduler.patch b/patches/unapplied/server/Improved-Async-Task-Scheduler.patch
similarity index 100%
rename from patches/server/Improved-Async-Task-Scheduler.patch
rename to patches/unapplied/server/Improved-Async-Task-Scheduler.patch
diff --git a/patches/server/Improved-Watchdog-Support.patch b/patches/unapplied/server/Improved-Watchdog-Support.patch
similarity index 100%
rename from patches/server/Improved-Watchdog-Support.patch
rename to patches/unapplied/server/Improved-Watchdog-Support.patch
diff --git a/patches/server/Increase-Light-Queue-Size.patch b/patches/unapplied/server/Increase-Light-Queue-Size.patch
similarity index 100%
rename from patches/server/Increase-Light-Queue-Size.patch
rename to patches/unapplied/server/Increase-Light-Queue-Size.patch
diff --git a/patches/server/Incremental-player-saving.patch b/patches/unapplied/server/Incremental-player-saving.patch
similarity index 100%
rename from patches/server/Incremental-player-saving.patch
rename to patches/unapplied/server/Incremental-player-saving.patch
diff --git a/patches/server/Inline-shift-direction-fields.patch b/patches/unapplied/server/Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/Inline-shift-direction-fields.patch
rename to patches/unapplied/server/Inline-shift-direction-fields.patch
diff --git a/patches/server/Introduce-beacon-activation-deactivation-events.patch b/patches/unapplied/server/Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/Introduce-beacon-activation-deactivation-events.patch
rename to patches/unapplied/server/Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/Inventory-close.patch b/patches/unapplied/server/Inventory-close.patch
similarity index 100%
rename from patches/server/Inventory-close.patch
rename to patches/unapplied/server/Inventory-close.patch
diff --git a/patches/server/Inventory-getHolder-method-without-block-snapshot.patch b/patches/unapplied/server/Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/unapplied/server/Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/Inventory-removeItemAnySlot.patch b/patches/unapplied/server/Inventory-removeItemAnySlot.patch
similarity index 100%
rename from patches/server/Inventory-removeItemAnySlot.patch
rename to patches/unapplied/server/Inventory-removeItemAnySlot.patch
diff --git a/patches/server/InventoryCloseEvent-Reason-API.patch b/patches/unapplied/server/InventoryCloseEvent-Reason-API.patch
similarity index 100%
rename from patches/server/InventoryCloseEvent-Reason-API.patch
rename to patches/unapplied/server/InventoryCloseEvent-Reason-API.patch
diff --git a/patches/server/Item-Rarity-API.patch b/patches/unapplied/server/Item-Rarity-API.patch
similarity index 100%
rename from patches/server/Item-Rarity-API.patch
rename to patches/unapplied/server/Item-Rarity-API.patch
diff --git a/patches/server/Item-canEntityPickup.patch b/patches/unapplied/server/Item-canEntityPickup.patch
similarity index 100%
rename from patches/server/Item-canEntityPickup.patch
rename to patches/unapplied/server/Item-canEntityPickup.patch
diff --git a/patches/server/Item-no-age-no-player-pickup.patch b/patches/unapplied/server/Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/Item-no-age-no-player-pickup.patch
rename to patches/unapplied/server/Item-no-age-no-player-pickup.patch
diff --git a/patches/server/ItemStack-getMaxItemUseDuration.patch b/patches/unapplied/server/ItemStack-getMaxItemUseDuration.patch
similarity index 100%
rename from patches/server/ItemStack-getMaxItemUseDuration.patch
rename to patches/unapplied/server/ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/server/ItemStack-repair-check-API.patch b/patches/unapplied/server/ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/ItemStack-repair-check-API.patch
rename to patches/unapplied/server/ItemStack-repair-check-API.patch
diff --git a/patches/server/Lag-compensate-block-breaking.patch b/patches/unapplied/server/Lag-compensate-block-breaking.patch
similarity index 100%
rename from patches/server/Lag-compensate-block-breaking.patch
rename to patches/unapplied/server/Lag-compensate-block-breaking.patch
diff --git a/patches/server/Lag-compensate-eating.patch b/patches/unapplied/server/Lag-compensate-eating.patch
similarity index 100%
rename from patches/server/Lag-compensate-eating.patch
rename to patches/unapplied/server/Lag-compensate-eating.patch
diff --git a/patches/server/Lazily-track-plugin-scoreboards-by-default.patch b/patches/unapplied/server/Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/unapplied/server/Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/Left-handed-API.patch b/patches/unapplied/server/Left-handed-API.patch
similarity index 100%
rename from patches/server/Left-handed-API.patch
rename to patches/unapplied/server/Left-handed-API.patch
diff --git a/patches/server/Limit-Client-Sign-length-more.patch b/patches/unapplied/server/Limit-Client-Sign-length-more.patch
similarity index 100%
rename from patches/server/Limit-Client-Sign-length-more.patch
rename to patches/unapplied/server/Limit-Client-Sign-length-more.patch
diff --git a/patches/server/Limit-item-frame-cursors-on-maps.patch b/patches/unapplied/server/Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/Limit-item-frame-cursors-on-maps.patch
rename to patches/unapplied/server/Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/Limit-recipe-packets.patch b/patches/unapplied/server/Limit-recipe-packets.patch
similarity index 100%
rename from patches/server/Limit-recipe-packets.patch
rename to patches/unapplied/server/Limit-recipe-packets.patch
diff --git a/patches/server/Line-Of-Sight-Changes.patch b/patches/unapplied/server/Line-Of-Sight-Changes.patch
similarity index 100%
rename from patches/server/Line-Of-Sight-Changes.patch
rename to patches/unapplied/server/Line-Of-Sight-Changes.patch
diff --git a/patches/server/LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/unapplied/server/LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 100%
rename from patches/server/LivingEntity-Hand-Raised-Item-Use-API.patch
rename to patches/unapplied/server/LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/patches/server/LivingEntity-setKiller.patch b/patches/unapplied/server/LivingEntity-setKiller.patch
similarity index 100%
rename from patches/server/LivingEntity-setKiller.patch
rename to patches/unapplied/server/LivingEntity-setKiller.patch
diff --git a/patches/server/Load-Chunks-for-Login-Asynchronously.patch b/patches/unapplied/server/Load-Chunks-for-Login-Asynchronously.patch
similarity index 100%
rename from patches/server/Load-Chunks-for-Login-Asynchronously.patch
rename to patches/unapplied/server/Load-Chunks-for-Login-Asynchronously.patch
diff --git a/patches/server/Log-when-the-async-catcher-is-tripped.patch b/patches/unapplied/server/Log-when-the-async-catcher-is-tripped.patch
similarity index 100%
rename from patches/server/Log-when-the-async-catcher-is-tripped.patch
rename to patches/unapplied/server/Log-when-the-async-catcher-is-tripped.patch
diff --git a/patches/server/LootTable-API-Replenishable-Lootables-Feature.patch b/patches/unapplied/server/LootTable-API-Replenishable-Lootables-Feature.patch
similarity index 100%
rename from patches/server/LootTable-API-Replenishable-Lootables-Feature.patch
rename to patches/unapplied/server/LootTable-API-Replenishable-Lootables-Feature.patch
diff --git a/patches/server/MC-135506-Experience-should-save-as-Integers.patch b/patches/unapplied/server/MC-135506-Experience-should-save-as-Integers.patch
similarity index 100%
rename from patches/server/MC-135506-Experience-should-save-as-Integers.patch
rename to patches/unapplied/server/MC-135506-Experience-should-save-as-Integers.patch
diff --git a/patches/server/MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/patches/unapplied/server/MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
similarity index 100%
rename from patches/server/MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
rename to patches/unapplied/server/MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
diff --git a/patches/server/MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/unapplied/server/MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from patches/server/MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to patches/unapplied/server/MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/MC-29274-Fix-Wither-hostility-towards-players.patch b/patches/unapplied/server/MC-29274-Fix-Wither-hostility-towards-players.patch
similarity index 100%
rename from patches/server/MC-29274-Fix-Wither-hostility-towards-players.patch
rename to patches/unapplied/server/MC-29274-Fix-Wither-hostility-towards-players.patch
diff --git a/patches/server/MC-4-Fix-item-position-desync.patch b/patches/unapplied/server/MC-4-Fix-item-position-desync.patch
similarity index 100%
rename from patches/server/MC-4-Fix-item-position-desync.patch
rename to patches/unapplied/server/MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/unapplied/server/MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 100%
rename from patches/server/MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to patches/unapplied/server/MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
diff --git a/patches/server/MC-Utils.patch b/patches/unapplied/server/MC-Utils.patch
similarity index 100%
rename from patches/server/MC-Utils.patch
rename to patches/unapplied/server/MC-Utils.patch
diff --git a/patches/server/Make-CallbackExecutor-strict-again.patch b/patches/unapplied/server/Make-CallbackExecutor-strict-again.patch
similarity index 100%
rename from patches/server/Make-CallbackExecutor-strict-again.patch
rename to patches/unapplied/server/Make-CallbackExecutor-strict-again.patch
diff --git a/patches/server/Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/unapplied/server/Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 100%
rename from patches/server/Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to patches/unapplied/server/Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/patches/server/Make-EnderDragon-implement-Mob.patch b/patches/unapplied/server/Make-EnderDragon-implement-Mob.patch
similarity index 100%
rename from patches/server/Make-EnderDragon-implement-Mob.patch
rename to patches/unapplied/server/Make-EnderDragon-implement-Mob.patch
diff --git a/patches/server/Make-EntityUnleashEvent-cancellable.patch b/patches/unapplied/server/Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/Make-EntityUnleashEvent-cancellable.patch
rename to patches/unapplied/server/Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/Make-hoppers-respect-inventory-max-stack-size.patch b/patches/unapplied/server/Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/unapplied/server/Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/Make-item-validations-configurable.patch b/patches/unapplied/server/Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/Make-item-validations-configurable.patch
rename to patches/unapplied/server/Make-item-validations-configurable.patch
diff --git a/patches/server/Make-legacy-ping-handler-more-reliable.patch b/patches/unapplied/server/Make-legacy-ping-handler-more-reliable.patch
similarity index 100%
rename from patches/server/Make-legacy-ping-handler-more-reliable.patch
rename to patches/unapplied/server/Make-legacy-ping-handler-more-reliable.patch
diff --git a/patches/server/Make-max-squid-spawn-height-configurable.patch b/patches/unapplied/server/Make-max-squid-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/Make-max-squid-spawn-height-configurable.patch
rename to patches/unapplied/server/Make-max-squid-spawn-height-configurable.patch
diff --git a/patches/server/Make-schedule-command-per-world.patch b/patches/unapplied/server/Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/Make-schedule-command-per-world.patch
rename to patches/unapplied/server/Make-schedule-command-per-world.patch
diff --git a/patches/server/Make-shield-blocking-delay-configurable.patch b/patches/unapplied/server/Make-shield-blocking-delay-configurable.patch
similarity index 100%
rename from patches/server/Make-shield-blocking-delay-configurable.patch
rename to patches/unapplied/server/Make-shield-blocking-delay-configurable.patch
diff --git a/patches/server/Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/unapplied/server/Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 100%
rename from patches/server/Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/unapplied/server/Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/patches/unapplied/server/Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
similarity index 100%
rename from patches/server/Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
rename to patches/unapplied/server/Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
diff --git a/patches/server/Make-the-GUI-graph-fancier.patch b/patches/unapplied/server/Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from patches/server/Make-the-GUI-graph-fancier.patch
rename to patches/unapplied/server/Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/Make-the-default-permission-message-configurable.patch b/patches/unapplied/server/Make-the-default-permission-message-configurable.patch
similarity index 100%
rename from patches/server/Make-the-default-permission-message-configurable.patch
rename to patches/unapplied/server/Make-the-default-permission-message-configurable.patch
diff --git a/patches/server/Manually-inline-methods-in-BlockPosition.patch b/patches/unapplied/server/Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/Manually-inline-methods-in-BlockPosition.patch
rename to patches/unapplied/server/Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/Maps-shouldn-t-load-chunks.patch b/patches/unapplied/server/Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/Maps-shouldn-t-load-chunks.patch
rename to patches/unapplied/server/Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/Mark-fish-and-axolotls-from-buckets-as-persistent.patch b/patches/unapplied/server/Mark-fish-and-axolotls-from-buckets-as-persistent.patch
similarity index 100%
rename from patches/server/Mark-fish-and-axolotls-from-buckets-as-persistent.patch
rename to patches/unapplied/server/Mark-fish-and-axolotls-from-buckets-as-persistent.patch
diff --git a/patches/server/Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/unapplied/server/Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/unapplied/server/Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/Missing-Entity-Behavior-API.patch b/patches/unapplied/server/Missing-Entity-Behavior-API.patch
similarity index 100%
rename from patches/server/Missing-Entity-Behavior-API.patch
rename to patches/unapplied/server/Missing-Entity-Behavior-API.patch
diff --git a/patches/server/Mob-Pathfinding-API.patch b/patches/unapplied/server/Mob-Pathfinding-API.patch
similarity index 100%
rename from patches/server/Mob-Pathfinding-API.patch
rename to patches/unapplied/server/Mob-Pathfinding-API.patch
diff --git a/patches/server/Mob-Spawner-API-Enhancements.patch b/patches/unapplied/server/Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from patches/server/Mob-Spawner-API-Enhancements.patch
rename to patches/unapplied/server/Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/More-CommmandBlock-API.patch b/patches/unapplied/server/More-CommmandBlock-API.patch
similarity index 100%
rename from patches/server/More-CommmandBlock-API.patch
rename to patches/unapplied/server/More-CommmandBlock-API.patch
diff --git a/patches/server/More-Enchantment-API.patch b/patches/unapplied/server/More-Enchantment-API.patch
similarity index 100%
rename from patches/server/More-Enchantment-API.patch
rename to patches/unapplied/server/More-Enchantment-API.patch
diff --git a/patches/server/More-Lidded-Block-API.patch b/patches/unapplied/server/More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/More-Lidded-Block-API.patch
rename to patches/unapplied/server/More-Lidded-Block-API.patch
diff --git a/patches/server/More-World-API.patch b/patches/unapplied/server/More-World-API.patch
similarity index 100%
rename from patches/server/More-World-API.patch
rename to patches/unapplied/server/More-World-API.patch
diff --git a/patches/server/More-lightning-API.patch b/patches/unapplied/server/More-lightning-API.patch
similarity index 100%
rename from patches/server/More-lightning-API.patch
rename to patches/unapplied/server/More-lightning-API.patch
diff --git a/patches/server/Move-BlockPistonRetractEvent-to-fix-duplication.patch b/patches/unapplied/server/Move-BlockPistonRetractEvent-to-fix-duplication.patch
similarity index 100%
rename from patches/server/Move-BlockPistonRetractEvent-to-fix-duplication.patch
rename to patches/unapplied/server/Move-BlockPistonRetractEvent-to-fix-duplication.patch
diff --git a/patches/server/Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/unapplied/server/Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 100%
rename from patches/server/Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/unapplied/server/Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/Move-range-check-for-block-placing-up.patch b/patches/unapplied/server/Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/Move-range-check-for-block-placing-up.patch
rename to patches/unapplied/server/Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/unapplied/server/Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/unapplied/server/Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/No-Tick-view-distance-implementation.patch b/patches/unapplied/server/No-Tick-view-distance-implementation.patch
similarity index 100%
rename from patches/server/No-Tick-view-distance-implementation.patch
rename to patches/unapplied/server/No-Tick-view-distance-implementation.patch
diff --git a/patches/server/Not-implemeneted.patch b/patches/unapplied/server/Not-implemeneted.patch
similarity index 100%
rename from patches/server/Not-implemeneted.patch
rename to patches/unapplied/server/Not-implemeneted.patch
diff --git a/patches/server/Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/unapplied/server/Ocelot-despawns-should-honor-nametags-and-leash.patch
similarity index 100%
rename from patches/server/Ocelot-despawns-should-honor-nametags-and-leash.patch
rename to patches/unapplied/server/Ocelot-despawns-should-honor-nametags-and-leash.patch
diff --git a/patches/server/Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/unapplied/server/Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 100%
rename from patches/server/Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to patches/unapplied/server/Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/unapplied/server/Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
similarity index 100%
rename from patches/server/Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
rename to patches/unapplied/server/Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
diff --git a/patches/server/Only-refresh-abilities-if-needed.patch b/patches/unapplied/server/Only-refresh-abilities-if-needed.patch
similarity index 100%
rename from patches/server/Only-refresh-abilities-if-needed.patch
rename to patches/unapplied/server/Only-refresh-abilities-if-needed.patch
diff --git a/patches/server/Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/patches/unapplied/server/Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
similarity index 100%
rename from patches/server/Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
rename to patches/unapplied/server/Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
diff --git a/patches/server/Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/unapplied/server/Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/unapplied/server/Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/Oprimise-map-impl-for-tracked-players.patch b/patches/unapplied/server/Oprimise-map-impl-for-tracked-players.patch
similarity index 100%
rename from patches/server/Oprimise-map-impl-for-tracked-players.patch
rename to patches/unapplied/server/Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/Optimise-ArraySetSorted-removeIf.patch b/patches/unapplied/server/Optimise-ArraySetSorted-removeIf.patch
similarity index 100%
rename from patches/server/Optimise-ArraySetSorted-removeIf.patch
rename to patches/unapplied/server/Optimise-ArraySetSorted-removeIf.patch
diff --git a/patches/server/Optimise-BlockSoil-nearby-water-lookup.patch b/patches/unapplied/server/Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/unapplied/server/Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/Optimise-BlockState-s-hashCode-equals.patch b/patches/unapplied/server/Optimise-BlockState-s-hashCode-equals.patch
similarity index 100%
rename from patches/server/Optimise-BlockState-s-hashCode-equals.patch
rename to patches/unapplied/server/Optimise-BlockState-s-hashCode-equals.patch
diff --git a/patches/server/Optimise-Chunk-getFluid.patch b/patches/unapplied/server/Optimise-Chunk-getFluid.patch
similarity index 100%
rename from patches/server/Optimise-Chunk-getFluid.patch
rename to patches/unapplied/server/Optimise-Chunk-getFluid.patch
diff --git a/patches/server/Optimise-IEntityAccess-getPlayerByUUID.patch b/patches/unapplied/server/Optimise-IEntityAccess-getPlayerByUUID.patch
similarity index 100%
rename from patches/server/Optimise-IEntityAccess-getPlayerByUUID.patch
rename to patches/unapplied/server/Optimise-IEntityAccess-getPlayerByUUID.patch
diff --git a/patches/server/Optimise-TickListServer-by-rewriting-it.patch b/patches/unapplied/server/Optimise-TickListServer-by-rewriting-it.patch
similarity index 100%
rename from patches/server/Optimise-TickListServer-by-rewriting-it.patch
rename to patches/unapplied/server/Optimise-TickListServer-by-rewriting-it.patch
diff --git a/patches/server/Optimise-WorldServer-notify.patch b/patches/unapplied/server/Optimise-WorldServer-notify.patch
similarity index 100%
rename from patches/server/Optimise-WorldServer-notify.patch
rename to patches/unapplied/server/Optimise-WorldServer-notify.patch
diff --git a/patches/server/Optimise-chunk-tick-iteration.patch b/patches/unapplied/server/Optimise-chunk-tick-iteration.patch
similarity index 100%
rename from patches/server/Optimise-chunk-tick-iteration.patch
rename to patches/unapplied/server/Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/unapplied/server/Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 100%
rename from patches/server/Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/unapplied/server/Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/Optimise-general-POI-access.patch b/patches/unapplied/server/Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/Optimise-general-POI-access.patch
rename to patches/unapplied/server/Optimise-general-POI-access.patch
diff --git a/patches/server/Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/unapplied/server/Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 100%
rename from patches/server/Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to patches/unapplied/server/Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/Optimise-getType-calls.patch b/patches/unapplied/server/Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/Optimise-getType-calls.patch
rename to patches/unapplied/server/Optimise-getType-calls.patch
diff --git a/patches/server/Optimise-nearby-player-lookups.patch b/patches/unapplied/server/Optimise-nearby-player-lookups.patch
similarity index 100%
rename from patches/server/Optimise-nearby-player-lookups.patch
rename to patches/unapplied/server/Optimise-nearby-player-lookups.patch
diff --git a/patches/server/Optimise-non-flush-packet-sending.patch b/patches/unapplied/server/Optimise-non-flush-packet-sending.patch
similarity index 100%
rename from patches/server/Optimise-non-flush-packet-sending.patch
rename to patches/unapplied/server/Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/Optimise-random-block-ticking.patch b/patches/unapplied/server/Optimise-random-block-ticking.patch
similarity index 100%
rename from patches/server/Optimise-random-block-ticking.patch
rename to patches/unapplied/server/Optimise-random-block-ticking.patch
diff --git a/patches/server/Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/unapplied/server/Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/unapplied/server/Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/Optimize-Bit-Operations-by-inlining.patch b/patches/unapplied/server/Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/Optimize-Bit-Operations-by-inlining.patch
rename to patches/unapplied/server/Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/Optimize-BlockPosition-helper-methods.patch b/patches/unapplied/server/Optimize-BlockPosition-helper-methods.patch
similarity index 100%
rename from patches/server/Optimize-BlockPosition-helper-methods.patch
rename to patches/unapplied/server/Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/Optimize-Captured-TileEntity-Lookup.patch b/patches/unapplied/server/Optimize-Captured-TileEntity-Lookup.patch
similarity index 100%
rename from patches/server/Optimize-Captured-TileEntity-Lookup.patch
rename to patches/unapplied/server/Optimize-Captured-TileEntity-Lookup.patch
diff --git a/patches/server/Optimize-Collision-to-not-load-chunks.patch b/patches/unapplied/server/Optimize-Collision-to-not-load-chunks.patch
similarity index 100%
rename from patches/server/Optimize-Collision-to-not-load-chunks.patch
rename to patches/unapplied/server/Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/Optimize-CraftBlockData-Creation.patch b/patches/unapplied/server/Optimize-CraftBlockData-Creation.patch
similarity index 100%
rename from patches/server/Optimize-CraftBlockData-Creation.patch
rename to patches/unapplied/server/Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/Optimize-DataBits.patch b/patches/unapplied/server/Optimize-DataBits.patch
similarity index 100%
rename from patches/server/Optimize-DataBits.patch
rename to patches/unapplied/server/Optimize-DataBits.patch
diff --git a/patches/server/Optimize-Dynamic-get-Missing-Keys.patch b/patches/unapplied/server/Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/unapplied/server/Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/Optimize-Hoppers.patch b/patches/unapplied/server/Optimize-Hoppers.patch
similarity index 100%
rename from patches/server/Optimize-Hoppers.patch
rename to patches/unapplied/server/Optimize-Hoppers.patch
diff --git a/patches/server/Optimize-IntIdentityHashBiMiap-nextId.patch b/patches/unapplied/server/Optimize-IntIdentityHashBiMiap-nextId.patch
similarity index 100%
rename from patches/server/Optimize-IntIdentityHashBiMiap-nextId.patch
rename to patches/unapplied/server/Optimize-IntIdentityHashBiMiap-nextId.patch
diff --git a/patches/server/Optimize-ItemStack.isEmpty.patch b/patches/unapplied/server/Optimize-ItemStack.isEmpty.patch
similarity index 100%
rename from patches/server/Optimize-ItemStack.isEmpty.patch
rename to patches/unapplied/server/Optimize-ItemStack.isEmpty.patch
diff --git a/patches/server/Optimize-MappedRegistry.patch b/patches/unapplied/server/Optimize-MappedRegistry.patch
similarity index 100%
rename from patches/server/Optimize-MappedRegistry.patch
rename to patches/unapplied/server/Optimize-MappedRegistry.patch
diff --git a/patches/server/Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/unapplied/server/Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 100%
rename from patches/server/Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to patches/unapplied/server/Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/Optimize-NetworkManager-Exception-Handling.patch b/patches/unapplied/server/Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/Optimize-NetworkManager-Exception-Handling.patch
rename to patches/unapplied/server/Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/Optimize-NibbleArray-to-use-pooled-buffers.patch b/patches/unapplied/server/Optimize-NibbleArray-to-use-pooled-buffers.patch
similarity index 100%
rename from patches/server/Optimize-NibbleArray-to-use-pooled-buffers.patch
rename to patches/unapplied/server/Optimize-NibbleArray-to-use-pooled-buffers.patch
diff --git a/patches/server/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/unapplied/server/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/unapplied/server/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/Optimize-Pathfinding.patch b/patches/unapplied/server/Optimize-Pathfinding.patch
similarity index 100%
rename from patches/server/Optimize-Pathfinding.patch
rename to patches/unapplied/server/Optimize-Pathfinding.patch
diff --git a/patches/server/Optimize-ServerLevels-chunk-level-checking-methods.patch b/patches/unapplied/server/Optimize-ServerLevels-chunk-level-checking-methods.patch
similarity index 100%
rename from patches/server/Optimize-ServerLevels-chunk-level-checking-methods.patch
rename to patches/unapplied/server/Optimize-ServerLevels-chunk-level-checking-methods.patch
diff --git a/patches/server/Optimize-UserCache-Thread-Safe.patch b/patches/unapplied/server/Optimize-UserCache-Thread-Safe.patch
similarity index 100%
rename from patches/server/Optimize-UserCache-Thread-Safe.patch
rename to patches/unapplied/server/Optimize-UserCache-Thread-Safe.patch
diff --git a/patches/server/Optimize-Voxel-Shape-Merging.patch b/patches/unapplied/server/Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/Optimize-Voxel-Shape-Merging.patch
rename to patches/unapplied/server/Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/Optimize-World-Time-Updates.patch b/patches/unapplied/server/Optimize-World-Time-Updates.patch
similarity index 100%
rename from patches/server/Optimize-World-Time-Updates.patch
rename to patches/unapplied/server/Optimize-World-Time-Updates.patch
diff --git a/patches/server/Optimize-World.isLoaded-BlockPosition-Z.patch b/patches/unapplied/server/Optimize-World.isLoaded-BlockPosition-Z.patch
similarity index 100%
rename from patches/server/Optimize-World.isLoaded-BlockPosition-Z.patch
rename to patches/unapplied/server/Optimize-World.isLoaded-BlockPosition-Z.patch
diff --git a/patches/server/Optimize-WorldBorder-collision-checks-and-air.patch b/patches/unapplied/server/Optimize-WorldBorder-collision-checks-and-air.patch
similarity index 100%
rename from patches/server/Optimize-WorldBorder-collision-checks-and-air.patch
rename to patches/unapplied/server/Optimize-WorldBorder-collision-checks-and-air.patch
diff --git a/patches/server/Optimize-brigadier-child-sorting-performance.patch b/patches/unapplied/server/Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from patches/server/Optimize-brigadier-child-sorting-performance.patch
rename to patches/unapplied/server/Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/Optimize-call-to-getFluid-for-explosions.patch b/patches/unapplied/server/Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from patches/server/Optimize-call-to-getFluid-for-explosions.patch
rename to patches/unapplied/server/Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/Optimize-entity-tracker-passenger-checks.patch b/patches/unapplied/server/Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/Optimize-entity-tracker-passenger-checks.patch
rename to patches/unapplied/server/Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/Optimize-explosions.patch b/patches/unapplied/server/Optimize-explosions.patch
similarity index 100%
rename from patches/server/Optimize-explosions.patch
rename to patches/unapplied/server/Optimize-explosions.patch
diff --git a/patches/server/Optimize-indirect-passenger-iteration.patch b/patches/unapplied/server/Optimize-indirect-passenger-iteration.patch
similarity index 100%
rename from patches/server/Optimize-indirect-passenger-iteration.patch
rename to patches/unapplied/server/Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/Optimize-isOutsideRange-to-use-distance-maps.patch b/patches/unapplied/server/Optimize-isOutsideRange-to-use-distance-maps.patch
similarity index 100%
rename from patches/server/Optimize-isOutsideRange-to-use-distance-maps.patch
rename to patches/unapplied/server/Optimize-isOutsideRange-to-use-distance-maps.patch
diff --git a/patches/server/Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/patches/unapplied/server/Optimize-isValidLocation-getType-and-getBlockData-fo.patch
similarity index 100%
rename from patches/server/Optimize-isValidLocation-getType-and-getBlockData-fo.patch
rename to patches/unapplied/server/Optimize-isValidLocation-getType-and-getBlockData-fo.patch
diff --git a/patches/server/Optimize-redstone-algorithm.patch b/patches/unapplied/server/Optimize-redstone-algorithm.patch
similarity index 100%
rename from patches/server/Optimize-redstone-algorithm.patch
rename to patches/unapplied/server/Optimize-redstone-algorithm.patch
diff --git a/patches/server/Optimize-sending-packets-to-nearby-locations-sounds-.patch b/patches/unapplied/server/Optimize-sending-packets-to-nearby-locations-sounds-.patch
similarity index 100%
rename from patches/server/Optimize-sending-packets-to-nearby-locations-sounds-.patch
rename to patches/unapplied/server/Optimize-sending-packets-to-nearby-locations-sounds-.patch
diff --git a/patches/server/Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/unapplied/server/Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from patches/server/Optimize-the-advancement-data-player-iteration-to-be.patch
rename to patches/unapplied/server/Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/unapplied/server/Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 100%
rename from patches/server/Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/unapplied/server/Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/unapplied/server/Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/unapplied/server/Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/unapplied/server/Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 100%
rename from patches/server/Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to patches/unapplied/server/Option-to-prevent-armor-stands-from-doing-entity-loo.patch
diff --git a/patches/server/Option-to-remove-corrupt-tile-entities.patch b/patches/unapplied/server/Option-to-remove-corrupt-tile-entities.patch
similarity index 100%
rename from patches/server/Option-to-remove-corrupt-tile-entities.patch
rename to patches/unapplied/server/Option-to-remove-corrupt-tile-entities.patch
diff --git a/patches/server/Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/unapplied/server/Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
similarity index 100%
rename from patches/server/Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
rename to patches/unapplied/server/Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
diff --git a/patches/server/Optional-TNT-doesn-t-move-in-water.patch b/patches/unapplied/server/Optional-TNT-doesn-t-move-in-water.patch
similarity index 100%
rename from patches/server/Optional-TNT-doesn-t-move-in-water.patch
rename to patches/unapplied/server/Optional-TNT-doesn-t-move-in-water.patch
diff --git a/patches/server/Paper-Metrics.patch b/patches/unapplied/server/Paper-Metrics.patch
similarity index 100%
rename from patches/server/Paper-Metrics.patch
rename to patches/unapplied/server/Paper-Metrics.patch
diff --git a/patches/server/Paper-dumpitem-command.patch b/patches/unapplied/server/Paper-dumpitem-command.patch
similarity index 100%
rename from patches/server/Paper-dumpitem-command.patch
rename to patches/unapplied/server/Paper-dumpitem-command.patch
diff --git a/patches/server/Per-Player-View-Distance-API-placeholders.patch b/patches/unapplied/server/Per-Player-View-Distance-API-placeholders.patch
similarity index 100%
rename from patches/server/Per-Player-View-Distance-API-placeholders.patch
rename to patches/unapplied/server/Per-Player-View-Distance-API-placeholders.patch
diff --git a/patches/server/Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/unapplied/server/Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 100%
rename from patches/server/Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to patches/unapplied/server/Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/patches/server/Player-Chunk-Load-Unload-Events.patch b/patches/unapplied/server/Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/Player-Chunk-Load-Unload-Events.patch
rename to patches/unapplied/server/Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/Player-Tab-List-and-Title-APIs.patch b/patches/unapplied/server/Player-Tab-List-and-Title-APIs.patch
similarity index 100%
rename from patches/server/Player-Tab-List-and-Title-APIs.patch
rename to patches/unapplied/server/Player-Tab-List-and-Title-APIs.patch
diff --git a/patches/server/Player-affects-spawning-API.patch b/patches/unapplied/server/Player-affects-spawning-API.patch
similarity index 100%
rename from patches/server/Player-affects-spawning-API.patch
rename to patches/unapplied/server/Player-affects-spawning-API.patch
diff --git a/patches/server/Player-elytra-boost-API.patch b/patches/unapplied/server/Player-elytra-boost-API.patch
similarity index 100%
rename from patches/server/Player-elytra-boost-API.patch
rename to patches/unapplied/server/Player-elytra-boost-API.patch
diff --git a/patches/server/Player.setPlayerProfile-API.patch b/patches/unapplied/server/Player.setPlayerProfile-API.patch
similarity index 100%
rename from patches/server/Player.setPlayerProfile-API.patch
rename to patches/unapplied/server/Player.setPlayerProfile-API.patch
diff --git a/patches/server/PlayerAdvancementCriterionGrantEvent.patch b/patches/unapplied/server/PlayerAdvancementCriterionGrantEvent.patch
similarity index 100%
rename from patches/server/PlayerAdvancementCriterionGrantEvent.patch
rename to patches/unapplied/server/PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/server/PlayerAttemptPickupItemEvent.patch b/patches/unapplied/server/PlayerAttemptPickupItemEvent.patch
similarity index 100%
rename from patches/server/PlayerAttemptPickupItemEvent.patch
rename to patches/unapplied/server/PlayerAttemptPickupItemEvent.patch
diff --git a/patches/server/PlayerDeathEvent-getItemsToKeep.patch b/patches/unapplied/server/PlayerDeathEvent-getItemsToKeep.patch
similarity index 100%
rename from patches/server/PlayerDeathEvent-getItemsToKeep.patch
rename to patches/unapplied/server/PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/server/PlayerDeathEvent-shouldDropExperience.patch b/patches/unapplied/server/PlayerDeathEvent-shouldDropExperience.patch
similarity index 100%
rename from patches/server/PlayerDeathEvent-shouldDropExperience.patch
rename to patches/unapplied/server/PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/server/PlayerElytraBoostEvent.patch b/patches/unapplied/server/PlayerElytraBoostEvent.patch
similarity index 100%
rename from patches/server/PlayerElytraBoostEvent.patch
rename to patches/unapplied/server/PlayerElytraBoostEvent.patch
diff --git a/patches/server/PlayerLaunchProjectileEvent.patch b/patches/unapplied/server/PlayerLaunchProjectileEvent.patch
similarity index 100%
rename from patches/server/PlayerLaunchProjectileEvent.patch
rename to patches/unapplied/server/PlayerLaunchProjectileEvent.patch
diff --git a/patches/server/PlayerNaturallySpawnCreaturesEvent.patch b/patches/unapplied/server/PlayerNaturallySpawnCreaturesEvent.patch
similarity index 100%
rename from patches/server/PlayerNaturallySpawnCreaturesEvent.patch
rename to patches/unapplied/server/PlayerNaturallySpawnCreaturesEvent.patch
diff --git a/patches/server/PlayerPickupExperienceEvent.patch b/patches/unapplied/server/PlayerPickupExperienceEvent.patch
similarity index 100%
rename from patches/server/PlayerPickupExperienceEvent.patch
rename to patches/unapplied/server/PlayerPickupExperienceEvent.patch
diff --git a/patches/server/PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/unapplied/server/PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 100%
rename from patches/server/PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to patches/unapplied/server/PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/patches/server/PlayerReadyArrowEvent.patch b/patches/unapplied/server/PlayerReadyArrowEvent.patch
similarity index 100%
rename from patches/server/PlayerReadyArrowEvent.patch
rename to patches/unapplied/server/PlayerReadyArrowEvent.patch
diff --git a/patches/server/PlayerTeleportEndGatewayEvent.patch b/patches/unapplied/server/PlayerTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/server/PlayerTeleportEndGatewayEvent.patch
rename to patches/unapplied/server/PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/server/PortalCreateEvent-needs-to-know-its-entity.patch b/patches/unapplied/server/PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/unapplied/server/PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/Potential-bed-API.patch b/patches/unapplied/server/Potential-bed-API.patch
similarity index 100%
rename from patches/server/Potential-bed-API.patch
rename to patches/unapplied/server/Potential-bed-API.patch
diff --git a/patches/server/PreCreatureSpawnEvent.patch b/patches/unapplied/server/PreCreatureSpawnEvent.patch
similarity index 100%
rename from patches/server/PreCreatureSpawnEvent.patch
rename to patches/unapplied/server/PreCreatureSpawnEvent.patch
diff --git a/patches/server/PreSpawnerSpawnEvent.patch b/patches/unapplied/server/PreSpawnerSpawnEvent.patch
similarity index 100%
rename from patches/server/PreSpawnerSpawnEvent.patch
rename to patches/unapplied/server/PreSpawnerSpawnEvent.patch
diff --git a/patches/server/Preserve-overstacked-loot.patch b/patches/unapplied/server/Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/Preserve-overstacked-loot.patch
rename to patches/unapplied/server/Preserve-overstacked-loot.patch
diff --git a/patches/server/Prevent-AFK-kick-while-watching-end-credits.patch b/patches/unapplied/server/Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 100%
rename from patches/server/Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/unapplied/server/Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/unapplied/server/Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 100%
rename from patches/server/Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to patches/unapplied/server/Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/patches/server/Prevent-Enderman-from-loading-chunks.patch b/patches/unapplied/server/Prevent-Enderman-from-loading-chunks.patch
similarity index 100%
rename from patches/server/Prevent-Enderman-from-loading-chunks.patch
rename to patches/unapplied/server/Prevent-Enderman-from-loading-chunks.patch
diff --git a/patches/server/Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/unapplied/server/Prevent-Frosted-Ice-from-loading-holding-chunks.patch
similarity index 100%
rename from patches/server/Prevent-Frosted-Ice-from-loading-holding-chunks.patch
rename to patches/unapplied/server/Prevent-Frosted-Ice-from-loading-holding-chunks.patch
diff --git a/patches/server/Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/unapplied/server/Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 100%
rename from patches/server/Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to patches/unapplied/server/Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
diff --git a/patches/server/Prevent-Pathfinding-out-of-World-Border.patch b/patches/unapplied/server/Prevent-Pathfinding-out-of-World-Border.patch
similarity index 100%
rename from patches/server/Prevent-Pathfinding-out-of-World-Border.patch
rename to patches/unapplied/server/Prevent-Pathfinding-out-of-World-Border.patch
diff --git a/patches/server/Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/unapplied/server/Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 100%
rename from patches/server/Prevent-bees-loading-chunks-checking-hive-position.patch
rename to patches/unapplied/server/Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/unapplied/server/Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 100%
rename from patches/server/Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to patches/unapplied/server/Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/Prevent-consuming-the-wrong-itemstack.patch b/patches/unapplied/server/Prevent-consuming-the-wrong-itemstack.patch
similarity index 100%
rename from patches/server/Prevent-consuming-the-wrong-itemstack.patch
rename to patches/unapplied/server/Prevent-consuming-the-wrong-itemstack.patch
diff --git a/patches/server/Prevent-grindstones-from-overstacking-items.patch b/patches/unapplied/server/Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/Prevent-grindstones-from-overstacking-items.patch
rename to patches/unapplied/server/Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/Prevent-headless-pistons-from-being-created.patch b/patches/unapplied/server/Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/Prevent-headless-pistons-from-being-created.patch
rename to patches/unapplied/server/Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/Prevent-logins-from-being-processed-when-the-player-.patch b/patches/unapplied/server/Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 100%
rename from patches/server/Prevent-logins-from-being-processed-when-the-player-.patch
rename to patches/unapplied/server/Prevent-logins-from-being-processed-when-the-player-.patch
diff --git a/patches/server/Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/unapplied/server/Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 100%
rename from patches/server/Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to patches/unapplied/server/Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/patches/server/Prevent-opening-inventories-when-frozen.patch b/patches/unapplied/server/Prevent-opening-inventories-when-frozen.patch
similarity index 100%
rename from patches/server/Prevent-opening-inventories-when-frozen.patch
rename to patches/unapplied/server/Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/Prevent-position-desync-in-playerconnection-causing-.patch b/patches/unapplied/server/Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 100%
rename from patches/server/Prevent-position-desync-in-playerconnection-causing-.patch
rename to patches/unapplied/server/Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/patches/server/Prevent-rayTrace-from-loading-chunks.patch b/patches/unapplied/server/Prevent-rayTrace-from-loading-chunks.patch
similarity index 100%
rename from patches/server/Prevent-rayTrace-from-loading-chunks.patch
rename to patches/unapplied/server/Prevent-rayTrace-from-loading-chunks.patch
diff --git a/patches/server/Prevent-softlocked-end-exit-portal-generation.patch b/patches/unapplied/server/Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/unapplied/server/Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/unapplied/server/Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from patches/server/Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to patches/unapplied/server/Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/Prevent-teleporting-dead-entities.patch b/patches/unapplied/server/Prevent-teleporting-dead-entities.patch
similarity index 100%
rename from patches/server/Prevent-teleporting-dead-entities.patch
rename to patches/unapplied/server/Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/Prevent-tile-entity-and-entity-crashes.patch b/patches/unapplied/server/Prevent-tile-entity-and-entity-crashes.patch
similarity index 100%
rename from patches/server/Prevent-tile-entity-and-entity-crashes.patch
rename to patches/unapplied/server/Prevent-tile-entity-and-entity-crashes.patch
diff --git a/patches/server/Prevent-unload-calls-removing-tickets-for-sync-loads.patch b/patches/unapplied/server/Prevent-unload-calls-removing-tickets-for-sync-loads.patch
similarity index 100%
rename from patches/server/Prevent-unload-calls-removing-tickets-for-sync-loads.patch
rename to patches/unapplied/server/Prevent-unload-calls-removing-tickets-for-sync-loads.patch
diff --git a/patches/server/Print-Error-details-when-failing-to-save-player-data.patch b/patches/unapplied/server/Print-Error-details-when-failing-to-save-player-data.patch
similarity index 100%
rename from patches/server/Print-Error-details-when-failing-to-save-player-data.patch
rename to patches/unapplied/server/Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/patches/server/Profile-Lookup-Events.patch b/patches/unapplied/server/Profile-Lookup-Events.patch
similarity index 100%
rename from patches/server/Profile-Lookup-Events.patch
rename to patches/unapplied/server/Profile-Lookup-Events.patch
diff --git a/patches/server/ProfileWhitelistVerifyEvent.patch b/patches/unapplied/server/ProfileWhitelistVerifyEvent.patch
similarity index 100%
rename from patches/server/ProfileWhitelistVerifyEvent.patch
rename to patches/unapplied/server/ProfileWhitelistVerifyEvent.patch
diff --git a/patches/server/Properly-fix-item-duplication-bug.patch b/patches/unapplied/server/Properly-fix-item-duplication-bug.patch
similarity index 100%
rename from patches/server/Properly-fix-item-duplication-bug.patch
rename to patches/unapplied/server/Properly-fix-item-duplication-bug.patch
diff --git a/patches/server/Properly-handle-async-calls-to-restart-the-server.patch b/patches/unapplied/server/Properly-handle-async-calls-to-restart-the-server.patch
similarity index 100%
rename from patches/server/Properly-handle-async-calls-to-restart-the-server.patch
rename to patches/unapplied/server/Properly-handle-async-calls-to-restart-the-server.patch
diff --git a/patches/server/Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/unapplied/server/Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 100%
rename from patches/server/Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/unapplied/server/Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/Provide-E-TE-Chunk-count-stat-methods.patch b/patches/unapplied/server/Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 100%
rename from patches/server/Provide-E-TE-Chunk-count-stat-methods.patch
rename to patches/unapplied/server/Provide-E-TE-Chunk-count-stat-methods.patch
diff --git a/patches/server/RangedEntity-API.patch b/patches/unapplied/server/RangedEntity-API.patch
similarity index 100%
rename from patches/server/RangedEntity-API.patch
rename to patches/unapplied/server/RangedEntity-API.patch
diff --git a/patches/server/Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/unapplied/server/Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/unapplied/server/Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/Reduce-Either-Optional-allocation.patch b/patches/unapplied/server/Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/server/Reduce-Either-Optional-allocation.patch
rename to patches/unapplied/server/Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/Reduce-MutableInt-allocations-from-light-engine.patch b/patches/unapplied/server/Reduce-MutableInt-allocations-from-light-engine.patch
similarity index 100%
rename from patches/server/Reduce-MutableInt-allocations-from-light-engine.patch
rename to patches/unapplied/server/Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/patches/server/Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/unapplied/server/Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 100%
rename from patches/server/Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/unapplied/server/Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/Reduce-blockpos-allocation-from-pathfinding.patch b/patches/unapplied/server/Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/unapplied/server/Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/unapplied/server/Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from patches/server/Reduce-memory-footprint-of-NBTTagCompound.patch
rename to patches/unapplied/server/Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/unapplied/server/Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 100%
rename from patches/server/Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/unapplied/server/Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/unapplied/server/Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 100%
rename from patches/server/Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to patches/unapplied/server/Refresh-player-inventory-when-cancelling-PlayerInter.patch
diff --git a/patches/server/Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/unapplied/server/Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 100%
rename from patches/server/Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to patches/unapplied/server/Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/unapplied/server/Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 100%
rename from patches/server/Remove-CraftScheduler-Async-Task-Debugger.patch
rename to patches/unapplied/server/Remove-CraftScheduler-Async-Task-Debugger.patch
diff --git a/patches/server/Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/patches/unapplied/server/Remove-FishingHook-reference-on-Craft-Entity-removal.patch
similarity index 100%
rename from patches/server/Remove-FishingHook-reference-on-Craft-Entity-removal.patch
rename to patches/unapplied/server/Remove-FishingHook-reference-on-Craft-Entity-removal.patch
diff --git a/patches/server/Remove-Metadata-on-reload.patch b/patches/unapplied/server/Remove-Metadata-on-reload.patch
similarity index 100%
rename from patches/server/Remove-Metadata-on-reload.patch
rename to patches/unapplied/server/Remove-Metadata-on-reload.patch
diff --git a/patches/server/Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/unapplied/server/Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/unapplied/server/Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/Remove-invalid-mob-spawner-tile-entities.patch b/patches/unapplied/server/Remove-invalid-mob-spawner-tile-entities.patch
similarity index 100%
rename from patches/server/Remove-invalid-mob-spawner-tile-entities.patch
rename to patches/unapplied/server/Remove-invalid-mob-spawner-tile-entities.patch
diff --git a/patches/server/Remove-some-streams-from-structures.patch b/patches/unapplied/server/Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/Remove-some-streams-from-structures.patch
rename to patches/unapplied/server/Remove-some-streams-from-structures.patch
diff --git a/patches/server/Remove-stale-POIs.patch b/patches/unapplied/server/Remove-stale-POIs.patch
similarity index 100%
rename from patches/server/Remove-stale-POIs.patch
rename to patches/unapplied/server/Remove-stale-POIs.patch
diff --git a/patches/server/Remove-streams-for-villager-AI.patch b/patches/unapplied/server/Remove-streams-for-villager-AI.patch
similarity index 100%
rename from patches/server/Remove-streams-for-villager-AI.patch
rename to patches/unapplied/server/Remove-streams-for-villager-AI.patch
diff --git a/patches/server/Remove-streams-from-Mob-AI-System.patch b/patches/unapplied/server/Remove-streams-from-Mob-AI-System.patch
similarity index 100%
rename from patches/server/Remove-streams-from-Mob-AI-System.patch
rename to patches/unapplied/server/Remove-streams-from-Mob-AI-System.patch
diff --git a/patches/server/Remove-streams-from-PairedQueue.patch b/patches/unapplied/server/Remove-streams-from-PairedQueue.patch
similarity index 100%
rename from patches/server/Remove-streams-from-PairedQueue.patch
rename to patches/unapplied/server/Remove-streams-from-PairedQueue.patch
diff --git a/patches/server/Remove-streams-from-SensorNearest.patch b/patches/unapplied/server/Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/Remove-streams-from-SensorNearest.patch
rename to patches/unapplied/server/Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/Remove-streams-from-classes-related-villager-gossip.patch b/patches/unapplied/server/Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/server/Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/unapplied/server/Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/Replace-player-chunk-loader-system.patch b/patches/unapplied/server/Replace-player-chunk-loader-system.patch
similarity index 100%
rename from patches/server/Replace-player-chunk-loader-system.patch
rename to patches/unapplied/server/Replace-player-chunk-loader-system.patch
diff --git a/patches/server/Replace-ticket-level-propagator.patch b/patches/unapplied/server/Replace-ticket-level-propagator.patch
similarity index 100%
rename from patches/server/Replace-ticket-level-propagator.patch
rename to patches/unapplied/server/Replace-ticket-level-propagator.patch
diff --git a/patches/server/Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/unapplied/server/Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/unapplied/server/Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/Reset-players-airTicks-on-respawn.patch b/patches/unapplied/server/Reset-players-airTicks-on-respawn.patch
similarity index 100%
rename from patches/server/Reset-players-airTicks-on-respawn.patch
rename to patches/unapplied/server/Reset-players-airTicks-on-respawn.patch
diff --git a/patches/server/Reset-shield-blocking-on-dimension-change.patch b/patches/unapplied/server/Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/Reset-shield-blocking-on-dimension-change.patch
rename to patches/unapplied/server/Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/unapplied/server/Reset-spawner-timer-when-spawner-event-is-cancelled.patch
similarity index 100%
rename from patches/server/Reset-spawner-timer-when-spawner-event-is-cancelled.patch
rename to patches/unapplied/server/Reset-spawner-timer-when-spawner-event-is-cancelled.patch
diff --git a/patches/server/Respect-despawn-rate-in-item-merge-check.patch b/patches/unapplied/server/Respect-despawn-rate-in-item-merge-check.patch
similarity index 100%
rename from patches/server/Respect-despawn-rate-in-item-merge-check.patch
rename to patches/unapplied/server/Respect-despawn-rate-in-item-merge-check.patch
diff --git a/patches/server/Restore-custom-InventoryHolder-support.patch b/patches/unapplied/server/Restore-custom-InventoryHolder-support.patch
similarity index 100%
rename from patches/server/Restore-custom-InventoryHolder-support.patch
rename to patches/unapplied/server/Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/Restore-vanlla-default-mob-spawn-range-and-water-ani.patch b/patches/unapplied/server/Restore-vanlla-default-mob-spawn-range-and-water-ani.patch
similarity index 100%
rename from patches/server/Restore-vanlla-default-mob-spawn-range-and-water-ani.patch
rename to patches/unapplied/server/Restore-vanlla-default-mob-spawn-range-and-water-ani.patch
diff --git a/patches/server/Restrict-vanilla-teleport-command-to-valid-locations.patch b/patches/unapplied/server/Restrict-vanilla-teleport-command-to-valid-locations.patch
similarity index 100%
rename from patches/server/Restrict-vanilla-teleport-command-to-valid-locations.patch
rename to patches/unapplied/server/Restrict-vanilla-teleport-command-to-valid-locations.patch
diff --git a/patches/server/Retain-block-place-order-when-capturing-blockstates.patch b/patches/unapplied/server/Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from patches/server/Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/unapplied/server/Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/unapplied/server/Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/unapplied/server/Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/unapplied/server/Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/unapplied/server/Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/Rewrite-dataconverter-system.patch b/patches/unapplied/server/Rewrite-dataconverter-system.patch
similarity index 100%
rename from patches/server/Rewrite-dataconverter-system.patch
rename to patches/unapplied/server/Rewrite-dataconverter-system.patch
diff --git a/patches/server/Rewrite-entity-bounding-box-lookup-calls.patch b/patches/unapplied/server/Rewrite-entity-bounding-box-lookup-calls.patch
similarity index 100%
rename from patches/server/Rewrite-entity-bounding-box-lookup-calls.patch
rename to patches/unapplied/server/Rewrite-entity-bounding-box-lookup-calls.patch
diff --git a/patches/server/Rewrite-the-light-engine.patch b/patches/unapplied/server/Rewrite-the-light-engine.patch
similarity index 100%
rename from patches/server/Rewrite-the-light-engine.patch
rename to patches/unapplied/server/Rewrite-the-light-engine.patch
diff --git a/patches/server/Sanitise-RegionFileCache-and-make-configurable.patch b/patches/unapplied/server/Sanitise-RegionFileCache-and-make-configurable.patch
similarity index 100%
rename from patches/server/Sanitise-RegionFileCache-and-make-configurable.patch
rename to patches/unapplied/server/Sanitise-RegionFileCache-and-make-configurable.patch
diff --git a/patches/server/Sanitize-ResourceLocation-error-logging.patch b/patches/unapplied/server/Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/Sanitize-ResourceLocation-error-logging.patch
rename to patches/unapplied/server/Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/Seed-based-feature-search.patch b/patches/unapplied/server/Seed-based-feature-search.patch
similarity index 100%
rename from patches/server/Seed-based-feature-search.patch
rename to patches/unapplied/server/Seed-based-feature-search.patch
diff --git a/patches/server/Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/unapplied/server/Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 100%
rename from patches/server/Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to patches/unapplied/server/Send-attack-SoundEffects-only-to-players-who-can-see.patch
diff --git a/patches/server/Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/unapplied/server/Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/unapplied/server/Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/unapplied/server/Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/unapplied/server/Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/Separate-lookup-locking-from-state-access-in-UserCac.patch b/patches/unapplied/server/Separate-lookup-locking-from-state-access-in-UserCac.patch
similarity index 100%
rename from patches/server/Separate-lookup-locking-from-state-access-in-UserCac.patch
rename to patches/unapplied/server/Separate-lookup-locking-from-state-access-in-UserCac.patch
diff --git a/patches/server/Server-Tick-Events.patch b/patches/unapplied/server/Server-Tick-Events.patch
similarity index 100%
rename from patches/server/Server-Tick-Events.patch
rename to patches/unapplied/server/Server-Tick-Events.patch
diff --git a/patches/server/Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch b/patches/unapplied/server/Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch
similarity index 100%
rename from patches/server/Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch
rename to patches/unapplied/server/Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch
diff --git a/patches/server/Set-Zombie-last-tick-at-start-of-drowning-process.patch b/patches/unapplied/server/Set-Zombie-last-tick-at-start-of-drowning-process.patch
similarity index 100%
rename from patches/server/Set-Zombie-last-tick-at-start-of-drowning-process.patch
rename to patches/unapplied/server/Set-Zombie-last-tick-at-start-of-drowning-process.patch
diff --git a/patches/server/Set-area-affect-cloud-rotation.patch b/patches/unapplied/server/Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/Set-area-affect-cloud-rotation.patch
rename to patches/unapplied/server/Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/unapplied/server/Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 100%
rename from patches/server/Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/unapplied/server/Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/unapplied/server/Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from patches/server/Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/unapplied/server/Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/Shoulder-Entities-Release-API.patch b/patches/unapplied/server/Shoulder-Entities-Release-API.patch
similarity index 100%
rename from patches/server/Shoulder-Entities-Release-API.patch
rename to patches/unapplied/server/Shoulder-Entities-Release-API.patch
diff --git a/patches/server/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/unapplied/server/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
similarity index 100%
rename from patches/server/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
rename to patches/unapplied/server/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
diff --git a/patches/server/Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/unapplied/server/Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 100%
rename from patches/server/Show-blockstate-location-if-we-failed-to-read-it.patch
rename to patches/unapplied/server/Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/Significantly-improve-performance-of-the-end-generat.patch b/patches/unapplied/server/Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/Significantly-improve-performance-of-the-end-generat.patch
rename to patches/unapplied/server/Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/SkeletonHorse-Additions.patch b/patches/unapplied/server/SkeletonHorse-Additions.patch
similarity index 100%
rename from patches/server/SkeletonHorse-Additions.patch
rename to patches/unapplied/server/SkeletonHorse-Additions.patch
diff --git a/patches/server/Skip-distance-map-update-when-spawning-disabled.patch b/patches/unapplied/server/Skip-distance-map-update-when-spawning-disabled.patch
similarity index 100%
rename from patches/server/Skip-distance-map-update-when-spawning-disabled.patch
rename to patches/unapplied/server/Skip-distance-map-update-when-spawning-disabled.patch
diff --git a/patches/server/Slime-Pathfinder-Events.patch b/patches/unapplied/server/Slime-Pathfinder-Events.patch
similarity index 100%
rename from patches/server/Slime-Pathfinder-Events.patch
rename to patches/unapplied/server/Slime-Pathfinder-Events.patch
diff --git a/patches/server/Spawn-player-in-correct-world-on-login.patch b/patches/unapplied/server/Spawn-player-in-correct-world-on-login.patch
similarity index 100%
rename from patches/server/Spawn-player-in-correct-world-on-login.patch
rename to patches/unapplied/server/Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/server/Stinger-API.patch b/patches/unapplied/server/Stinger-API.patch
similarity index 100%
rename from patches/server/Stinger-API.patch
rename to patches/unapplied/server/Stinger-API.patch
diff --git a/patches/server/Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/unapplied/server/Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 100%
rename from patches/server/Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to patches/unapplied/server/Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/patches/server/String-based-Action-Bar-API.patch b/patches/unapplied/server/String-based-Action-Bar-API.patch
similarity index 100%
rename from patches/server/String-based-Action-Bar-API.patch
rename to patches/unapplied/server/String-based-Action-Bar-API.patch
diff --git a/patches/server/Support-components-in-ItemMeta.patch b/patches/unapplied/server/Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/Support-components-in-ItemMeta.patch
rename to patches/unapplied/server/Support-components-in-ItemMeta.patch
diff --git a/patches/server/Support-old-UUID-format-for-NBT.patch b/patches/unapplied/server/Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/Support-old-UUID-format-for-NBT.patch
rename to patches/unapplied/server/Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/unapplied/server/Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
similarity index 100%
rename from patches/server/Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
rename to patches/unapplied/server/Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
diff --git a/patches/server/System-property-for-disabling-watchdoge.patch b/patches/unapplied/server/System-property-for-disabling-watchdoge.patch
similarity index 100%
rename from patches/server/System-property-for-disabling-watchdoge.patch
rename to patches/unapplied/server/System-property-for-disabling-watchdoge.patch
diff --git a/patches/server/Tameable-getOwnerUniqueId-API.patch b/patches/unapplied/server/Tameable-getOwnerUniqueId-API.patch
similarity index 100%
rename from patches/server/Tameable-getOwnerUniqueId-API.patch
rename to patches/unapplied/server/Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/server/Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/unapplied/server/Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/unapplied/server/Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/Throw-proper-exception-on-empty-JsonList-file.patch b/patches/unapplied/server/Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/unapplied/server/Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/Time-scoreboard-search.patch b/patches/unapplied/server/Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/Time-scoreboard-search.patch
rename to patches/unapplied/server/Time-scoreboard-search.patch
diff --git a/patches/server/Timings-v2.patch b/patches/unapplied/server/Timings-v2.patch
similarity index 100%
rename from patches/server/Timings-v2.patch
rename to patches/unapplied/server/Timings-v2.patch
diff --git a/patches/server/Toggle-for-removing-existing-dragon.patch b/patches/unapplied/server/Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/Toggle-for-removing-existing-dragon.patch
rename to patches/unapplied/server/Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/unapplied/server/Toggleable-player-crits-helps-mitigate-hacked-client.patch
similarity index 100%
rename from patches/server/Toggleable-player-crits-helps-mitigate-hacked-client.patch
rename to patches/unapplied/server/Toggleable-player-crits-helps-mitigate-hacked-client.patch
diff --git a/patches/server/Tracking-Range-Improvements.patch b/patches/unapplied/server/Tracking-Range-Improvements.patch
similarity index 100%
rename from patches/server/Tracking-Range-Improvements.patch
rename to patches/unapplied/server/Tracking-Range-Improvements.patch
diff --git a/patches/server/Turtle-API.patch b/patches/unapplied/server/Turtle-API.patch
similarity index 100%
rename from patches/server/Turtle-API.patch
rename to patches/unapplied/server/Turtle-API.patch
diff --git a/patches/server/Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/unapplied/server/Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 100%
rename from patches/server/Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to patches/unapplied/server/Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
diff --git a/patches/server/Update-entity-Metadata-for-all-tracked-players.patch b/patches/unapplied/server/Update-entity-Metadata-for-all-tracked-players.patch
similarity index 100%
rename from patches/server/Update-entity-Metadata-for-all-tracked-players.patch
rename to patches/unapplied/server/Update-entity-Metadata-for-all-tracked-players.patch
diff --git a/patches/server/Update-head-rotation-in-missing-places.patch b/patches/unapplied/server/Update-head-rotation-in-missing-places.patch
similarity index 100%
rename from patches/server/Update-head-rotation-in-missing-places.patch
rename to patches/unapplied/server/Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/Update-itemstack-legacy-name-and-lore.patch b/patches/unapplied/server/Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/server/Update-itemstack-legacy-name-and-lore.patch
rename to patches/unapplied/server/Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/Upstream-config-migrations.patch b/patches/unapplied/server/Upstream-config-migrations.patch
similarity index 100%
rename from patches/server/Upstream-config-migrations.patch
rename to patches/unapplied/server/Upstream-config-migrations.patch
diff --git a/patches/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/unapplied/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
similarity index 100%
rename from patches/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
rename to patches/unapplied/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
diff --git a/patches/server/Use-ConcurrentHashMap-in-JsonList.patch b/patches/unapplied/server/Use-ConcurrentHashMap-in-JsonList.patch
similarity index 100%
rename from patches/server/Use-ConcurrentHashMap-in-JsonList.patch
rename to patches/unapplied/server/Use-ConcurrentHashMap-in-JsonList.patch
diff --git a/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/unapplied/server/Use-TerminalConsoleAppender-for-console-improvements.patch
similarity index 100%
rename from patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch
rename to patches/unapplied/server/Use-TerminalConsoleAppender-for-console-improvements.patch
diff --git a/patches/server/Use-UserCache-for-player-heads.patch b/patches/unapplied/server/Use-UserCache-for-player-heads.patch
similarity index 100%
rename from patches/server/Use-UserCache-for-player-heads.patch
rename to patches/unapplied/server/Use-UserCache-for-player-heads.patch
diff --git a/patches/server/Use-Vanilla-Minecart-Speeds.patch b/patches/unapplied/server/Use-Vanilla-Minecart-Speeds.patch
similarity index 100%
rename from patches/server/Use-Vanilla-Minecart-Speeds.patch
rename to patches/unapplied/server/Use-Vanilla-Minecart-Speeds.patch
diff --git a/patches/server/Use-Velocity-compression-and-cipher-natives.patch b/patches/unapplied/server/Use-Velocity-compression-and-cipher-natives.patch
similarity index 100%
rename from patches/server/Use-Velocity-compression-and-cipher-natives.patch
rename to patches/unapplied/server/Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/Use-a-Queue-for-Queueing-Commands.patch b/patches/unapplied/server/Use-a-Queue-for-Queueing-Commands.patch
similarity index 100%
rename from patches/server/Use-a-Queue-for-Queueing-Commands.patch
rename to patches/unapplied/server/Use-a-Queue-for-Queueing-Commands.patch
diff --git a/patches/server/Use-a-Shared-Random-for-Entities.patch b/patches/unapplied/server/Use-a-Shared-Random-for-Entities.patch
similarity index 100%
rename from patches/server/Use-a-Shared-Random-for-Entities.patch
rename to patches/unapplied/server/Use-a-Shared-Random-for-Entities.patch
diff --git a/patches/server/Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/unapplied/server/Use-correct-LevelStem-registry-when-loading-default-.patch
similarity index 100%
rename from patches/server/Use-correct-LevelStem-registry-when-loading-default-.patch
rename to patches/unapplied/server/Use-correct-LevelStem-registry-when-loading-default-.patch
diff --git a/patches/server/Use-distance-map-to-optimise-entity-tracker.patch b/patches/unapplied/server/Use-distance-map-to-optimise-entity-tracker.patch
similarity index 100%
rename from patches/server/Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/unapplied/server/Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/patches/server/Use-getChunkIfLoadedImmediately-in-places.patch b/patches/unapplied/server/Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 100%
rename from patches/server/Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/unapplied/server/Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/Use-hash-table-for-maintaing-changed-block-set.patch b/patches/unapplied/server/Use-hash-table-for-maintaing-changed-block-set.patch
similarity index 100%
rename from patches/server/Use-hash-table-for-maintaing-changed-block-set.patch
rename to patches/unapplied/server/Use-hash-table-for-maintaing-changed-block-set.patch
diff --git a/patches/server/Use-proper-max-length-when-serialising-BungeeCord-te.patch b/patches/unapplied/server/Use-proper-max-length-when-serialising-BungeeCord-te.patch
similarity index 100%
rename from patches/server/Use-proper-max-length-when-serialising-BungeeCord-te.patch
rename to patches/unapplied/server/Use-proper-max-length-when-serialising-BungeeCord-te.patch
diff --git a/patches/server/Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/unapplied/server/Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/unapplied/server/Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/unapplied/server/Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 100%
rename from patches/server/Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to patches/unapplied/server/Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/Validate-tripwire-hook-placement-before-update.patch b/patches/unapplied/server/Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from patches/server/Validate-tripwire-hook-placement-before-update.patch
rename to patches/unapplied/server/Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/Vanilla-command-permission-fixes.patch b/patches/unapplied/server/Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/Vanilla-command-permission-fixes.patch
rename to patches/unapplied/server/Vanilla-command-permission-fixes.patch
diff --git a/patches/server/VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/unapplied/server/VanillaCommandWrapper-didnt-account-for-entity-sende.patch
similarity index 100%
rename from patches/server/VanillaCommandWrapper-didnt-account-for-entity-sende.patch
rename to patches/unapplied/server/VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/Vanished-players-don-t-have-rights.patch b/patches/unapplied/server/Vanished-players-don-t-have-rights.patch
similarity index 100%
rename from patches/server/Vanished-players-don-t-have-rights.patch
rename to patches/unapplied/server/Vanished-players-don-t-have-rights.patch
diff --git a/patches/server/Vex-get-setSummoner-API.patch b/patches/unapplied/server/Vex-get-setSummoner-API.patch
similarity index 100%
rename from patches/server/Vex-get-setSummoner-API.patch
rename to patches/unapplied/server/Vex-get-setSummoner-API.patch
diff --git a/patches/server/Villager-Restocks-API.patch b/patches/unapplied/server/Villager-Restocks-API.patch
similarity index 100%
rename from patches/server/Villager-Restocks-API.patch
rename to patches/unapplied/server/Villager-Restocks-API.patch
diff --git a/patches/server/Villager-resetOffers.patch b/patches/unapplied/server/Villager-resetOffers.patch
similarity index 100%
rename from patches/server/Villager-resetOffers.patch
rename to patches/unapplied/server/Villager-resetOffers.patch
diff --git a/patches/server/Wait-for-Async-Tasks-during-shutdown.patch b/patches/unapplied/server/Wait-for-Async-Tasks-during-shutdown.patch
similarity index 100%
rename from patches/server/Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/unapplied/server/Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/patches/server/WitchConsumePotionEvent.patch b/patches/unapplied/server/WitchConsumePotionEvent.patch
similarity index 100%
rename from patches/server/WitchConsumePotionEvent.patch
rename to patches/unapplied/server/WitchConsumePotionEvent.patch
diff --git a/patches/server/WitchReadyPotionEvent.patch b/patches/unapplied/server/WitchReadyPotionEvent.patch
similarity index 100%
rename from patches/server/WitchReadyPotionEvent.patch
rename to patches/unapplied/server/WitchReadyPotionEvent.patch
diff --git a/patches/server/WitchThrowPotionEvent.patch b/patches/unapplied/server/WitchThrowPotionEvent.patch
similarity index 100%
rename from patches/server/WitchThrowPotionEvent.patch
rename to patches/unapplied/server/WitchThrowPotionEvent.patch
diff --git a/patches/server/Workaround-for-setting-passengers-on-players.patch b/patches/unapplied/server/Workaround-for-setting-passengers-on-players.patch
similarity index 100%
rename from patches/server/Workaround-for-setting-passengers-on-players.patch
rename to patches/unapplied/server/Workaround-for-setting-passengers-on-players.patch
diff --git a/patches/server/Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/unapplied/server/Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 100%
rename from patches/server/Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to patches/unapplied/server/Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/patches/server/Zombie-API-breaking-doors.patch b/patches/unapplied/server/Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/Zombie-API-breaking-doors.patch
rename to patches/unapplied/server/Zombie-API-breaking-doors.patch
diff --git a/patches/server/add-DragonEggFormEvent.patch b/patches/unapplied/server/add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/add-DragonEggFormEvent.patch
rename to patches/unapplied/server/add-DragonEggFormEvent.patch
diff --git a/patches/server/add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/unapplied/server/add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from patches/server/add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/unapplied/server/add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/unapplied/server/add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/unapplied/server/add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/add-get-set-drop-chance-to-EntityEquipment.patch b/patches/unapplied/server/add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/unapplied/server/add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/add-hand-to-BlockMultiPlaceEvent.patch b/patches/unapplied/server/add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from patches/server/add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/unapplied/server/add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/add-isDeeplySleeping-to-HumanEntity.patch b/patches/unapplied/server/add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/unapplied/server/add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/add-more-information-to-Entity.toString.patch b/patches/unapplied/server/add-more-information-to-Entity.toString.patch
similarity index 100%
rename from patches/server/add-more-information-to-Entity.toString.patch
rename to patches/unapplied/server/add-more-information-to-Entity.toString.patch
diff --git a/patches/server/add-per-world-spawn-limits.patch b/patches/unapplied/server/add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/add-per-world-spawn-limits.patch
rename to patches/unapplied/server/add-per-world-spawn-limits.patch
diff --git a/patches/server/added-PlayerNameEntityEvent.patch b/patches/unapplied/server/added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/added-PlayerNameEntityEvent.patch
rename to patches/unapplied/server/added-PlayerNameEntityEvent.patch
diff --git a/patches/server/added-Wither-API.patch b/patches/unapplied/server/added-Wither-API.patch
similarity index 100%
rename from patches/server/added-Wither-API.patch
rename to patches/unapplied/server/added-Wither-API.patch
diff --git a/patches/server/added-option-to-disable-pathfinding-updates-on-block.patch b/patches/unapplied/server/added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from patches/server/added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/unapplied/server/added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/additions-to-PlayerGameModeChangeEvent.patch b/patches/unapplied/server/additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/server/additions-to-PlayerGameModeChangeEvent.patch
rename to patches/unapplied/server/additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/call-PortalCreateEvent-players-and-end-platform.patch b/patches/unapplied/server/call-PortalCreateEvent-players-and-end-platform.patch
similarity index 100%
rename from patches/server/call-PortalCreateEvent-players-and-end-platform.patch
rename to patches/unapplied/server/call-PortalCreateEvent-players-and-end-platform.patch
diff --git a/patches/server/copy-TESign-isEditable-from-snapshots.patch b/patches/unapplied/server/copy-TESign-isEditable-from-snapshots.patch
similarity index 100%
rename from patches/server/copy-TESign-isEditable-from-snapshots.patch
rename to patches/unapplied/server/copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/don-t-attempt-to-teleport-dead-entities.patch b/patches/unapplied/server/don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/don-t-attempt-to-teleport-dead-entities.patch
rename to patches/unapplied/server/don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/unapplied/server/don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 100%
rename from patches/server/don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to patches/unapplied/server/don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/fix-PigZombieAngerEvent-cancellation.patch b/patches/unapplied/server/fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/fix-PigZombieAngerEvent-cancellation.patch
rename to patches/unapplied/server/fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/fix-PlayerItemHeldEvent-firing-twice.patch b/patches/unapplied/server/fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/unapplied/server/fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/fix-cancelling-block-falling-causing-client-desync.patch b/patches/unapplied/server/fix-cancelling-block-falling-causing-client-desync.patch
similarity index 100%
rename from patches/server/fix-cancelling-block-falling-causing-client-desync.patch
rename to patches/unapplied/server/fix-cancelling-block-falling-causing-client-desync.patch
diff --git a/patches/server/fix-converting-txt-to-json-file.patch b/patches/unapplied/server/fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/server/fix-converting-txt-to-json-file.patch
rename to patches/unapplied/server/fix-converting-txt-to-json-file.patch
diff --git a/patches/server/fix-dead-slime-setSize-invincibility.patch b/patches/unapplied/server/fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/fix-dead-slime-setSize-invincibility.patch
rename to patches/unapplied/server/fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/fix-various-menus-with-empty-level-accesses.patch b/patches/unapplied/server/fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/fix-various-menus-with-empty-level-accesses.patch
rename to patches/unapplied/server/fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/force-entity-dismount-during-teleportation.patch b/patches/unapplied/server/force-entity-dismount-during-teleportation.patch
similarity index 100%
rename from patches/server/force-entity-dismount-during-teleportation.patch
rename to patches/unapplied/server/force-entity-dismount-during-teleportation.patch
diff --git a/patches/server/forced-whitelist-use-configurable-kick-message.patch b/patches/unapplied/server/forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/forced-whitelist-use-configurable-kick-message.patch
rename to patches/unapplied/server/forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/getPlayerUniqueId-API.patch b/patches/unapplied/server/getPlayerUniqueId-API.patch
similarity index 100%
rename from patches/server/getPlayerUniqueId-API.patch
rename to patches/unapplied/server/getPlayerUniqueId-API.patch
diff --git a/patches/server/handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/unapplied/server/handle-NaN-health-absorb-values-and-repair-bad-data.patch
similarity index 100%
rename from patches/server/handle-NaN-health-absorb-values-and-repair-bad-data.patch
rename to patches/unapplied/server/handle-NaN-health-absorb-values-and-repair-bad-data.patch
diff --git a/patches/server/handle-PacketPlayInKeepAlive-async.patch b/patches/unapplied/server/handle-PacketPlayInKeepAlive-async.patch
similarity index 100%
rename from patches/server/handle-PacketPlayInKeepAlive-async.patch
rename to patches/unapplied/server/handle-PacketPlayInKeepAlive-async.patch
diff --git a/patches/server/implement-optional-per-player-mob-spawns.patch b/patches/unapplied/server/implement-optional-per-player-mob-spawns.patch
similarity index 100%
rename from patches/server/implement-optional-per-player-mob-spawns.patch
rename to patches/unapplied/server/implement-optional-per-player-mob-spawns.patch
diff --git a/patches/server/improve-CraftWorld-isChunkLoaded.patch b/patches/unapplied/server/improve-CraftWorld-isChunkLoaded.patch
similarity index 100%
rename from patches/server/improve-CraftWorld-isChunkLoaded.patch
rename to patches/unapplied/server/improve-CraftWorld-isChunkLoaded.patch
diff --git a/patches/server/incremental-chunk-saving.patch b/patches/unapplied/server/incremental-chunk-saving.patch
similarity index 100%
rename from patches/server/incremental-chunk-saving.patch
rename to patches/unapplied/server/incremental-chunk-saving.patch
diff --git a/patches/server/living-entity-allow-attribute-registration.patch b/patches/unapplied/server/living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/living-entity-allow-attribute-registration.patch
rename to patches/unapplied/server/living-entity-allow-attribute-registration.patch
diff --git a/patches/server/misc-debugging-dumps.patch b/patches/unapplied/server/misc-debugging-dumps.patch
similarity index 100%
rename from patches/server/misc-debugging-dumps.patch
rename to patches/unapplied/server/misc-debugging-dumps.patch
diff --git a/patches/server/offset-item-frame-ticking.patch b/patches/unapplied/server/offset-item-frame-ticking.patch
similarity index 100%
rename from patches/server/offset-item-frame-ticking.patch
rename to patches/unapplied/server/offset-item-frame-ticking.patch
diff --git a/patches/server/prevent-unintended-light-block-manipulation.patch b/patches/unapplied/server/prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/prevent-unintended-light-block-manipulation.patch
rename to patches/unapplied/server/prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/unapplied/server/provide-a-configurable-option-to-disable-creeper-lin.patch
similarity index 100%
rename from patches/server/provide-a-configurable-option-to-disable-creeper-lin.patch
rename to patches/unapplied/server/provide-a-configurable-option-to-disable-creeper-lin.patch
diff --git a/patches/server/remove-null-possibility-for-getServer-singleton.patch b/patches/unapplied/server/remove-null-possibility-for-getServer-singleton.patch
similarity index 100%
rename from patches/server/remove-null-possibility-for-getServer-singleton.patch
rename to patches/unapplied/server/remove-null-possibility-for-getServer-singleton.patch
diff --git a/patches/server/revert-serverside-behavior-of-keepalives.patch b/patches/unapplied/server/revert-serverside-behavior-of-keepalives.patch
similarity index 100%
rename from patches/server/revert-serverside-behavior-of-keepalives.patch
rename to patches/unapplied/server/revert-serverside-behavior-of-keepalives.patch
diff --git a/patches/server/stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/unapplied/server/stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from patches/server/stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to patches/unapplied/server/stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/use-CB-BlockState-implementations-for-captured-block.patch b/patches/unapplied/server/use-CB-BlockState-implementations-for-captured-block.patch
similarity index 100%
rename from patches/server/use-CB-BlockState-implementations-for-captured-block.patch
rename to patches/unapplied/server/use-CB-BlockState-implementations-for-captured-block.patch
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d6037036b6..1514614884 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,7 +7,11 @@ pluginManagement {
 
 rootProject.name = "Paper"
 
-include("Paper-API", "Paper-Server", "Paper-MojangAPI")
+include(
+    "Paper-API",
+    "Paper-Server",
+    // "Paper-MojangAPI", // todo
+)
 
 val testPlugin = file("test-plugin.settings.gradle.kts")
 if (testPlugin.exists()) {
diff --git a/test-plugin/build.gradle.kts b/test-plugin/build.gradle.kts
index bdff4f9499..0e5df46f8e 100644
--- a/test-plugin/build.gradle.kts
+++ b/test-plugin/build.gradle.kts
@@ -6,7 +6,7 @@ repositories {
 
 dependencies {
     compileOnly(project(":Paper-API"))
-    compileOnly(project(":Paper-MojangAPI"))
+    // compileOnly(project(":Paper-MojangAPI")) // todo
 }
 
 tasks.processResources {