Updated Upstream (Paper 1.20.6)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@abc49bf Begin update to 1.20.5
PaperMC/Paper@f2c45ed do some work
PaperMC/Paper@00c14f2 Move logging patches after adventure
PaperMC/Paper@ef057bb work on Adventure patch
PaperMC/Paper@380c4d2 Add plugin remapping patches
PaperMC/Paper@7cdf804 Work
PaperMC/Paper@dd6ce09 Fix reflection diff and order wrt commodore diff
PaperMC/Paper@598a1cb Apply shadow removal patch
PaperMC/Paper@ffccfd5 Apply timings
PaperMC/Paper@eb41348 33
PaperMC/Paper@9cac5b6 Fix continueServerUpdate with 2-line subjects
PaperMC/Paper@2eeed9e 41
PaperMC/Paper@d07c487 Don't use defaultToolchain method for run tasks
PaperMC/Paper@f2350fe Set mercury sourceCompat
PaperMC/Paper@5cfd92b Fix api compile
PaperMC/Paper@862d004 work on some API stuff
PaperMC/Paper@d6a3c0c fix 2 of our javadoc errors
PaperMC/Paper@487555b update
PaperMC/Paper@0225537 Update upstream
PaperMC/Paper@906f906 Patches!
PaperMC/Paper@8244815 221
PaperMC/Paper@309ebc1 253
PaperMC/Paper@1d7d7e9 301
PaperMC/Paper@9079c90 354
PaperMC/Paper@cc46148 405
PaperMC/Paper@5be858e Patches!
PaperMC/Paper@2d9d0d8 Patches!
PaperMC/Paper@a403a8d Patches!!!!!!!
PaperMC/Paper@21afc0a Patches!!!!!!!
PaperMC/Paper@1de0dc8 666 plus 1
PaperMC/Paper@4e654f2 More patch work
PaperMC/Paper@e832328 Check for existing am session before running continueServerUpdate
PaperMC/Paper@fc5c0da 683
PaperMC/Paper@90095cd 694
PaperMC/Paper@71ae391 more work (721)
PaperMC/Paper@22227cc more more work (757)
PaperMC/Paper@4d9e824 more more work (806)
PaperMC/Paper@9617829 Restore original formatting for MC-252817 patch
PaperMC/Paper@0518559 Update reflection rewriter to 0.0.1 release
PaperMC/Paper@e0a245d Patches!!!!!!!
PaperMC/Paper@1104431 955
PaperMC/Paper@1df7e21 Apply more API-implementing patches
PaperMC/Paper@b733809 Drop conduit api patch (upstream implemented same api with same method signatures)
PaperMC/Paper@c95db4f adventure 4.17.0-SNAPSHOT
PaperMC/Paper@bb1351c some work on adventure
PaperMC/Paper@1444b36 work on adventure
PaperMC/Paper@ce0e78c compile fixes
PaperMC/Paper@25f7c68 compile fixes
PaperMC/Paper@690b1cd compile fixes
PaperMC/Paper@b673721 compile fixes
PaperMC/Paper@6a87d14 dataconverter
PaperMC/Paper@ec9f7e3 starlight
PaperMC/Paper@e9eec78 chunk system
PaperMC/Paper@f6ea373 Patches
PaperMC/Paper@ec4ada8 Apply and move up non-optimization patches
PaperMC/Paper@c9907c6 More patches
PaperMC/Paper@2debcaf More more patches, including hopper optimization patch
PaperMC/Paper@6da0d8c (Almost) all patches applied
PaperMC/Paper@345b5c1 Patches!!!!!!! (we are done)
PaperMC/Paper@4590038 Fix properly resend patches
PaperMC/Paper@457e2c8 pass more stuff
PaperMC/Paper@b8da9ac item meta patch work
PaperMC/Paper@ccf158a update smithing recipe copy data components API
PaperMC/Paper@653f043 readd fix bee aging patch
PaperMC/Paper@bab31b6 Update Enchantment damage increase API
PaperMC/Paper@f4c7639 Un-jankify root user detection
PaperMC/Paper@9c58056 Some more compilation fixes
PaperMC/Paper@b984f66 Missing FQN in CraftPotionBrewer getter
PaperMC/Paper@768befe Remove patch renaming scripts
PaperMC/Paper@04a25c2 Fix WorldCreator#keepSpawnLoaded
PaperMC/Paper@820f999 Fixes for cb pkg ver
PaperMC/Paper@ca9001a compile fixes
PaperMC/Paper@d01f6b2 Fix more compile issues
PaperMC/Paper@8d3759d More more compile fixes
PaperMC/Paper@ed79038 More compile fixes
PaperMC/Paper@2641c02 Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@68aea43 Fixup damage source change
PaperMC/Paper@3062eb2 address my own comments
PaperMC/Paper@e85e1ec fixup sus effect entry patches
PaperMC/Paper@10e6143 fixup adventure's book meta handling
PaperMC/Paper@a244281 Replace VanillaGradle use and update generated API
PaperMC/Paper@31ad90b some more compile fixes
PaperMC/Paper@d2ef062 generator fix
PaperMC/Paper@7c6411b compile fixes
PaperMC/Paper@867eb90 compile fixes
PaperMC/Paper@62b96c5 compile fixes
PaperMC/Paper@c5c2a5f hunk system fixes
PaperMC/Paper@bcdf1f9 fixup loom pattern select event patch
PaperMC/Paper@43d110e fix issue with item default attribute API
PaperMC/Paper@2997fd6 plugin manager updates
PaperMC/Paper@7e9da43 support patch versions in api-version
PaperMC/Paper@813cfbf Fix compile issues
PaperMC/Paper@478a971 Fix light setting in protochunk
PaperMC/Paper@8b28f9f Fix accumulated total ticking chunks not being updated
PaperMC/Paper@00dac83 Drop old decompile fix
PaperMC/Paper@f6fae41 fix chat_type issue
PaperMC/Paper@cc81668 fix some issues on the todo list
PaperMC/Paper@44e68c3 fix some more issues
PaperMC/Paper@1bc278b Update patched spigot decompiler to fix inconsistency based on processing order
PaperMC/Paper@19ac9d4 remove no longer needed patches and fix tests
PaperMC/Paper@e856d17 Update paper plugin check in PluginRemapper
PaperMC/Paper@882ea0a fix adventure translations
PaperMC/Paper@4c53ace fix exact choice recipes
PaperMC/Paper@464cc81 fix custom potion mixes
PaperMC/Paper@ff77f82 paperweight 1.6.0
PaperMC/Paper@6a4974b Remove shadow from build classpath
PaperMC/Paper@c38f96b deprecate our ItemRarity API
PaperMC/Paper@ba8512a fix javadocs for SpawnerEntry$Equipment API
PaperMC/Paper@f1fc1b3 readd old UUID format patch
PaperMC/Paper@5485043 Don't tell people to build the reobf jar
PaperMC/Paper@2f19f0f fix enchantment order issue
PaperMC/Paper@80bd015 fix adventure converters not using RegistryOps
PaperMC/Paper@68e23db add back missing call to profile fill events
PaperMC/Paper@9bac389 more fixes
PaperMC/Paper@81f4405 add back hunk to async SavedData IO
PaperMC/Paper@91b5de6 bunch of fixes and improvements
PaperMC/Paper@f85d423 improve dumpitem and pgive commands
PaperMC/Paper@5731f34 Restore Handle Large Packets Disconnecting Client Patch
PaperMC/Paper@f037f08 Unify plugin remapping debug flags
PaperMC/Paper@c82766d fix item flags
PaperMC/Paper@f933c35 Update DataConverter to 1.20.6-rc1
PaperMC/Paper@55b1a87 fix PotionEffectType#getEffectAttributes
PaperMC/Paper@0b1b1fe fix helmet damage reduction inconsistencies
PaperMC/Paper@e2552ee Start cleaning up plugin remapping patches
PaperMC/Paper@711dbd7 Bump adventure ansi serializer
PaperMC/Paper@af97400 update generator
PaperMC/Paper@b7e148a Move obfhelper/stack deobf diff into original patch
PaperMC/Paper@a390119 Move cb version definition to gradle patch
PaperMC/Paper@20af7a7 remove funny diff
PaperMC/Paper@b3ea907 more ItemFlag fixes
PaperMC/Paper@53d8edd properly check for experimental stuff in generator
PaperMC/Paper@a771940 Revert to vanilla handling of LivingEntity#actuallyHurt (#10463)
PaperMC/Paper@06cae13 Update jdk version and distribution in actions
PaperMC/Paper@dd571d8 Fix bad diff in build gradle file
PaperMC/Paper@d02bb81 proper migration to gamerules for keep spawn loaded distance
PaperMC/Paper@aeb3f37 update paperweight to 1.6.1
PaperMC/Paper@75c22d5 Bump tiny-remapper
PaperMC/Paper@8454786 Bump tiny-remapper (real)
PaperMC/Paper@d99d84a Temporarily comment out adventure jd links
PaperMC/Paper@83767f9 Use JetBrains runtime for run tasks
PaperMC/Paper@4ad6022 improve checking handled tags in itemmeta (#9470)
PaperMC/Paper@8ce62b3 Fix issue with hopppers
PaperMC/Paper@7e3d5b5 bump paperweight to 1.6.2 to fix spurious build failure from scanJar OOM
PaperMC/Paper@d964c15 fix last test issue
PaperMC/Paper@3e90a19 Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@d93c6f9 remove calls to DoNotUse methods
PaperMC/Paper@f187fd6 Only scan `org.bukkit.craftbukkit.inventory` in `MetaHandledTagsTest`
PaperMC/Paper@a3c4dc9 Fix the incorrect codec usage in the Style convert (#10465)
PaperMC/Paper@e16263c Fix firework meta NPE
PaperMC/Paper@306b203 more fixes for ItemMeta relating to components
PaperMC/Paper@1a03cc9 Fix test compilation
PaperMC/Paper@6e31f38 Fix book meta lacking resolved tag from older versions (Fixes #10470)
PaperMC/Paper@37b3891 Fix another missing book meta tag
PaperMC/Paper@c4a1cd1 Fix issue with empty lists in adventure predicates
PaperMC/Paper@9d6e7e3 Don't hard fail on plugin remap error
PaperMC/Paper@4491ac0 respect hard list size limits in ItemMeta
PaperMC/Paper@aed7dca Fix overly strong name validation in player heads
PaperMC/Paper@0f4d328 final missing validation for data components
PaperMC/Paper@52ff3b7 Add itemName components (Resolves #10467) (#10471)
PaperMC/Paper@ba673a3 [ci skip] Feature requests are now in GitHub Discussions (#10606)
PaperMC/Paper@0f3e324 [ci skip] Fix discussion template file name (#10607)
PaperMC/Paper@82a8012 [ci skip] adjust projects workflow for label changes
PaperMC/Paper@61c9c07 Fix CraftMetaBlockState adding extra tags
PaperMC/Paper@7f2d531 Rewrite reflection in library loader jars (#10608)
PaperMC/Paper@05308fc Remap plugin libraries with namespace set to spigot (#10610)
PaperMC/Paper@69a971a Reset component prototype on itemtype change
PaperMC/Paper@f9397e1 Fix incorrect Commodore mapping of sweeping enchant
PaperMC/Paper@8f7ac62 Validate manifest provided mapping namespace (#10612)
PaperMC/Paper@fbe3c00 [ci skip] update projects workflow configuration
PaperMC/Paper@44ee092 1.20.6 (#10623)
PaperMC/Paper@812ccb9 fix spawnChunkRadius gamerule resetting
PaperMC/Paper@25e44bc fix dumpitem command nbt format
PaperMC/Paper@3fdd094 Fix sealed package check in BytecodeModifyingURLClassLoader (#10627)
PaperMC/Paper@937a67a Add initial size cap to component map
PaperMC/Paper@4ea67ab [ci skip] Remove trailing comma in projects action
PaperMC/Paper@8c058f8 Update paperweight to 1.6.3 (#10626)
PaperMC/Paper@fa6013d Fixes beds not exploding in the nether
PaperMC/Paper@3e0eb4a Updated Upstream (CraftBukkit) (#10624)
PaperMC/Paper@4cfd9e2 Expose canReach to mob pathfinding API (#10636)
PaperMC/Paper@b8c454c Add damage check for mending (#10631)
PaperMC/Paper@310b47b Update Java version references, add note on var usages
PaperMC/Paper@faa7aa2 Add GameMode#isInvulnerable (#10633)
PaperMC/Paper@18c201b Add EquipmentSlot#getOppositeHand (#10632)
PaperMC/Paper@544ce20 Expose #hasColor to leather armor (#10638)
PaperMC/Paper@59fe7cc default save-empty-scoreboard-teams to vanilla
PaperMC/Paper@0db72ac Fix can_place_on conversion and size check for item containers
PaperMC/Paper@156675c Fix lodestone compass target conversion
PaperMC/Paper@5632210 add RegistryAccess for managing registries (#10154)
PaperMC/Paper@6fcca46 Add missing step in V3818
PaperMC/Paper@7401313 fix shear drops for wolf and bogged
PaperMC/Paper@7ae2c67 Keep components using single items in creative (#10664)
PaperMC/Paper@b13c7db Add missing experimental field and annotations (#10653)
PaperMC/Paper@9d8d38d Updated Upstream (CraftBukkit) (#10646)
PaperMC/Paper@0e43d3c Added API to get player's proxy address (#10400)
PaperMC/Paper@54c5ecb Add missing SpigotConfig logCommands check (#10659)
PaperMC/Paper@816ea9e [ci skip] Update old particle reference in javadoc (#10652)
PaperMC/Paper@716dfd8 Fix EntityLoadCrossbowEvent (#10645)
PaperMC/Paper@21d91ce Prevent profile lookups when unnecessary (#10651)
PaperMC/Paper@2a6a5fe Add a way to check whether the chest is blocked (#10635)
PaperMC/Paper@ac3a547 Fix BlockStateMeta (#10647)

patches/server/0003-Sakura-Configuration-Files.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Sakura Configuration Files
 
 
 diff --git a/src/main/java/io/papermc/paper/configuration/Configurations.java b/src/main/java/io/papermc/paper/configuration/Configurations.java
-index 218bf89fd7583d6db9f64754c4db8fcce5415bdb..df0da18b38f382a452b1e1489a4f2c332f2f1311 100644
+index 96142deb42700f888ea08689ab62c27ef2b881fd..87f4320a29506417d29e83b06245a3d4edcbb383 100644
 --- a/src/main/java/io/papermc/paper/configuration/Configurations.java
 +++ b/src/main/java/io/papermc/paper/configuration/Configurations.java
-@@ -93,7 +93,7 @@ public abstract class Configurations<G, W> {
+@@ -96,7 +96,7 @@ public abstract class Configurations<G, W> {
          };
      }
  
@@ -17,7 +17,7 @@ index 218bf89fd7583d6db9f64754c4db8fcce5415bdb..df0da18b38f382a452b1e1489a4f2c33
          return node -> {
              ObjectMapper.Factory factory = (ObjectMapper.Factory) Objects.requireNonNull(node.options().serializers().get(type));
              ObjectMapper.Mutable<T> mutable = (ObjectMapper.Mutable<T>) factory.get(type);
-@@ -227,7 +227,7 @@ public abstract class Configurations<G, W> {
+@@ -231,7 +231,7 @@ public abstract class Configurations<G, W> {
              .path(worldConfigFile)
              .build();
          final ConfigurationNode worldNode = worldLoader.load();
@@ -27,7 +27,7 @@ index 218bf89fd7583d6db9f64754c4db8fcce5415bdb..df0da18b38f382a452b1e1489a4f2c33
          } else {
              this.verifyWorldConfigVersion(contextMap, worldNode);
 diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
-index fa1c0aee8c3a4d0868482cf5c703bbfd08e09874..9ea2e60095526e63a1f4a0087cfd59067bb92c7e 100644
+index 83a726bcf8b7dce73a361b0d79dbd63a0afc7a12..d43267fe2718b6016fe44c3bbf8196f8efc49ef1 100644
 --- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
 +++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
 @@ -457,7 +457,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
@@ -388,10 +388,10 @@ index 0000000000000000000000000000000000000000..5296d4e0a1041932e36562f42fbf3e1d
 +}
 diff --git a/src/main/java/me/samsuik/sakura/configuration/SakuraConfigurations.java b/src/main/java/me/samsuik/sakura/configuration/SakuraConfigurations.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..04dc81634277d05894076a2cafde60ca35e1886e
+index 0000000000000000000000000000000000000000..24a7b677f4c45375739c01546f08cabc44c56ba2
 --- /dev/null
 +++ b/src/main/java/me/samsuik/sakura/configuration/SakuraConfigurations.java
-@@ -0,0 +1,251 @@
+@@ -0,0 +1,252 @@
 +package me.samsuik.sakura.configuration;
 +
 +import com.google.common.collect.Table;
@@ -426,6 +426,7 @@ index 0000000000000000000000000000000000000000..04dc81634277d05894076a2cafde60ca
 +import net.minecraft.world.item.Item;
 +import net.minecraft.world.level.block.Block;
 +import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
++import org.checkerframework.checker.nullness.qual.Nullable;
 +import org.slf4j.Logger;
 +import org.spongepowered.configurate.ConfigurateException;
 +import org.spongepowered.configurate.ConfigurationNode;
@@ -575,7 +576,7 @@ index 0000000000000000000000000000000000000000..04dc81634277d05894076a2cafde60ca
 +    }
 +
 +    @Override
-+    protected void applyWorldConfigTransformations(final ContextMap contextMap, final ConfigurationNode node) throws ConfigurateException {
++    protected void applyWorldConfigTransformations(final ContextMap contextMap, final ConfigurationNode node, final @Nullable ConfigurationNode defaultsNode) throws ConfigurateException {
 +        final ConfigurationTransformation.VersionedBuilder versionedBuilder = Transformations.versionedBuilder();
 +        V2_VerticalKnockbackUseDefault.apply(versionedBuilder);
 +        V3_RenameKnockback.apply(versionedBuilder);
@@ -932,10 +933,10 @@ index 0000000000000000000000000000000000000000..4024f9738e039ffffd560a07a2210f75
 +public record DurableMaterial(int durability, float resistance) {
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e4ef4306d93cb81868468b78b98fc4c6b7633103..ca9013a7141a4e6b5b45651961dd977929a0756b 100644
+index db709ec011e2ad002c7b08cb7dd8ed8b84aeee37..91d3224cb30f62008a116fa4f913b06928d43c0a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -306,6 +306,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -313,6 +313,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public final double[] recentTps = new double[ 3 ];
      // Spigot end
      public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations; // Paper - add paper configuration files
@@ -943,7 +944,7 @@ index e4ef4306d93cb81868468b78b98fc4c6b7633103..ca9013a7141a4e6b5b45651961dd9779
      public static long currentTickLong = 0L; // Paper - track current tick as a long
      public boolean isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
  
-@@ -412,6 +413,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -422,6 +423,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this));
          // CraftBukkit end
          this.paperConfigurations = services.paperConfigurations(); // Paper - add paper configuration files
@@ -955,10 +956,10 @@ index e4ef4306d93cb81868468b78b98fc4c6b7633103..ca9013a7141a4e6b5b45651961dd9779
  
      private void readScoreboard(DimensionDataStorage persistentStateManager) {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 68d268b6fff126e8645b6deec3fb549ea2286b77..66eb8a462b472003333bb0af897e7650f5b63aa4 100644
+index eb4fc900164d1fb3a78653ae8bc42ea30323f5b7..4af33141f6c9169a016978cf74dc2d33ebd011e8 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -221,6 +221,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -234,6 +234,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
          io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // Paper - init PaperBrigadierProvider
@@ -971,23 +972,23 @@ index 68d268b6fff126e8645b6deec3fb549ea2286b77..66eb8a462b472003333bb0af897e7650
          this.setPvpAllowed(dedicatedserverproperties.pvp);
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 502bdc726b7890b00ee36871d905dea44e8719e3..ed7b9d9a3856cf36b64e629a86c2e9bdac381eb3 100644
+index 0981d440d0dbfe4df668d1f3f1b5706a93bc4434..cffdb530be035d177ccfd13a9e560c544f3acaac 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -692,7 +692,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -697,7 +697,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          // Holder holder = worlddimension.type(); // CraftBukkit - decompile error
  
          // Objects.requireNonNull(minecraftserver); // CraftBukkit - decompile error
--        super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> minecraftserver.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess())), executor); // Paper - create paper world configs; Async-Anti-Xray: Pass executor
-+        super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> minecraftserver.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess())), () -> minecraftserver.sakuraConfigurations.createWorldConfig(me.samsuik.sakura.configuration.SakuraConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), minecraftserver.registryAccess())), executor); // Sakura // Paper - create paper world configs; Async-Anti-Xray: Pass executor
+-        super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> minecraftserver.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess(), iworlddataserver.getGameRules())), executor); // Paper - create paper world configs; Async-Anti-Xray: Pass executor
++        super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> minecraftserver.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess(), iworlddataserver.getGameRules())), () -> minecraftserver.sakuraConfigurations.createWorldConfig(me.samsuik.sakura.configuration.SakuraConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), minecraftserver.registryAccess())), executor); // Sakura // Paper - create paper world configs; Async-Anti-Xray: Pass executor
          this.pvpMode = minecraftserver.isPvpAllowed();
          this.convertable = convertable_conversionsession;
          this.uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile());
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index ca89d1593bf1b46c79a882db528cbca1359dc9d4..a0a68ff09689d457f3c6e17f3e5d6d595f84684a 100644
+index b4ef3ad2c17168085372f1fe46809f02d9dfe74a..3a30562a4ec500eade01b646aacbdfbba39f547b 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -171,6 +171,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -168,6 +168,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return this.paperConfig;
      }
      // Paper end - add paper world config
@@ -1000,7 +1001,7 @@ index ca89d1593bf1b46c79a882db528cbca1359dc9d4..a0a68ff09689d457f3c6e17f3e5d6d59
  
      public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
      public final co.aikar.timings.WorldTimingsHandler timings; // Paper
-@@ -216,9 +222,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -213,9 +219,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      public abstract ResourceKey<LevelStem> getTypeKey();
  
@@ -1013,7 +1014,7 @@ index ca89d1593bf1b46c79a882db528cbca1359dc9d4..a0a68ff09689d457f3c6e17f3e5d6d59
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index af2c7758373ca3ecd53ca185f6730c284e964b26..870da24cb911f1cad20c79cc1bfbf3dc69ed3b83 100644
+index 6d01828434b8dce0359fe2a37b450e0aae916e3b..ec7c15ceb51388a7a349b2e852693f09757c6cc5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1054,6 +1054,7 @@ public final class CraftServer implements Server {
@@ -1033,10 +1034,10 @@ index af2c7758373ca3ecd53ca185f6730c284e964b26..870da24cb911f1cad20c79cc1bfbf3dc
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 8d626fadcd4743b6472a2954d2b1b2ec89669814..7107b54327f76bbd5265898f09e166423fee96e0 100644
+index c988afa496d25314451435eedd64079a0d87cef0..2453abb371c6a7ba407ff2d906391d6a13ed5d6b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -174,6 +174,14 @@ public class Main {
+@@ -175,6 +175,14 @@ public class Main {
                          .describedAs("Jar file");
                  // Paper end